diff --git a/src/main/java/net/coreprotect/command/CommandHandler.java b/src/main/java/net/coreprotect/command/CommandHandler.java
index 7876adb..081e5bd 100755
--- a/src/main/java/net/coreprotect/command/CommandHandler.java
+++ b/src/main/java/net/coreprotect/command/CommandHandler.java
@@ -1121,9 +1121,13 @@ public class CommandHandler implements CommandExecutor {
         return worldName;
     }
 
-    private static Map<String, Set<Material>> getTags() {
+    protected static Map<String, Set<Material>> getTags() {
         Map<String, Set<Material>> tagMap = new HashMap<>();
+        tagMap.put("#button", BlockGroup.BUTTONS);
+        tagMap.put("#container", BlockGroup.CONTAINERS);
+        tagMap.put("#door", BlockGroup.DOORS);
         tagMap.put("#natural", BlockGroup.NATURAL_BLOCKS);
+        tagMap.put("#pressure_plate", BlockGroup.PRESSURE_PLATES);
         tagMap.put("#shulker_box", BlockGroup.SHULKER_BOXES);
         return tagMap;
     }
diff --git a/src/main/java/net/coreprotect/command/TabHandler.java b/src/main/java/net/coreprotect/command/TabHandler.java
index bbff8f5..e7e0370 100755
--- a/src/main/java/net/coreprotect/command/TabHandler.java
+++ b/src/main/java/net/coreprotect/command/TabHandler.java
@@ -318,8 +318,9 @@ public class TabHandler implements TabCompleter {
                     }
 
                     // add custom tags
-                    materialList.add("#natural");
-                    materialList.add("#shulker_box");
+                    for (String tag : CommandHandler.getTags().keySet()) {
+                        materialList.add(tag);
+                    }
 
                     materials = new ArrayList<>(materialList);
                 }