diff --git a/src/main/java/ninja/Bucket.java b/src/main/java/ninja/Bucket.java
index e546e3b..f08804e 100644
--- a/src/main/java/ninja/Bucket.java
+++ b/src/main/java/ninja/Bucket.java
@@ -363,9 +363,11 @@ public int countObjects(@Nullable String query) {
     }
 
     private boolean isMatchingObject(@Nullable String query, File currentFile) {
-        return (Strings.isEmpty(query) || currentFile.getName().contains(query))
-               && currentFile.isFile()
-               && !currentFile.getName().startsWith("$");
+        if (!currentFile.isFile() || currentFile.getName().startsWith("$")) {
+            return false;
+        }
+
+        return Strings.isEmpty(query) || StoredObject.decodeKey(currentFile.getName()).contains(query);
     }
 
     protected int getVersion() {