--- a/net/minecraft/client/gui/overlay/DebugOverlayGui.java
+++ b/net/minecraft/client/gui/overlay/DebugOverlayGui.java
@@ -357,7 +357,7 @@
                list.add(this.func_211534_a(entry));
             }
 
-            for(ResourceLocation resourcelocation : this.field_175242_a.func_147114_u().func_199724_l().func_199717_a().func_199913_a(blockstate.func_177230_c())) {
+            for(ResourceLocation resourcelocation : blockstate.func_177230_c().getTags()) {
                list.add("#" + resourcelocation);
             }
          }
@@ -373,7 +373,7 @@
                list.add(this.func_211534_a(entry1));
             }
 
-            for(ResourceLocation resourcelocation1 : this.field_175242_a.func_147114_u().func_199724_l().func_205704_c().func_199913_a(ifluidstate.func_206886_c())) {
+            for(ResourceLocation resourcelocation1 : ifluidstate.func_206886_c().getTags()) {
                list.add("#" + resourcelocation1);
             }
          }
@@ -383,6 +383,7 @@
             list.add("");
             list.add(TextFormatting.UNDERLINE + "Targeted Entity");
             list.add(String.valueOf((Object)Registry.field_212629_r.func_177774_c(entity.func_200600_R())));
+            entity.func_200600_R().getTags().forEach(t -> list.add("#" + t));
          }
 
          return list;