diff --git a/src/com/sk89q/worldedit/superpickaxe/QueryTool.java b/src/com/sk89q/worldedit/superpickaxe/QueryTool.java
index 7ba54fc86..d0bd2de43 100644
--- a/src/com/sk89q/worldedit/superpickaxe/QueryTool.java
+++ b/src/com/sk89q/worldedit/superpickaxe/QueryTool.java
@@ -45,6 +45,13 @@ public class QueryTool implements SuperPickaxeMode {
         if (block instanceof MobSpawnerBlock) {
             player.printRaw("\u00A7e" + "Mob Type: "
                     + ((MobSpawnerBlock)block).getMobType());
+        } else if (block instanceof NoteBlock) {
+            player.printRaw("\u00A7e" + "Note block: "
+                    + ((NoteBlock)block).getNote());
+        } else if (block.getType() == BlockID.CLOTH) {
+            // Should never be null
+            player.printRaw("\u00A7e" + "Color: "
+                    + ClothColor.fromID(block.getData()).getName());
         }
     
         return true;