diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 115e4dea8..15b797942 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,6 @@
 2.31
 -----
-
+* Fixed the app from becoming unresponsive at launch with a large amount of notes.
 
 2.30
 -----
diff --git a/Simplenote/src/main/java/com/automattic/simplenote/models/Note.java b/Simplenote/src/main/java/com/automattic/simplenote/models/Note.java
index b1d7a051b..a7c5c9bef 100644
--- a/Simplenote/src/main/java/com/automattic/simplenote/models/Note.java
+++ b/Simplenote/src/main/java/com/automattic/simplenote/models/Note.java
@@ -99,7 +99,7 @@ public static Query<Note> search(Bucket<Note> noteBucket, String searchString) {
     public static Query<Note> allInTag(Bucket<Note> noteBucket, String tag) {
         return noteBucket.query()
                 .where(DELETED_PROPERTY, ComparisonType.NOT_EQUAL_TO, true)
-                .where(TAGS_PROPERTY, ComparisonType.LIKE, tag);
+                .where(TAGS_PROPERTY, ComparisonType.EQUAL_TO, tag);
     }
 
     public static Query<Note> allWithNoTag(Bucket<Note> noteBucket) {