diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/HomeActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/HomeActivity.java
index 759665b660..803483d724 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/HomeActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/HomeActivity.java
@@ -120,7 +120,7 @@ public class HomeActivity extends AppCompatActivity implements NavigationView.On
             @Override
             public void afterTextChanged(Editable editable) {
                 mDomainAdapter.loadDomains(editable.toString());
-                if(editable.length()>0) {
+                if (editable.length() > 0) {
                     mSearchIconView.setVisibility(View.GONE);
                     mClearSearch.setVisibility(View.VISIBLE);
                 } else {
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java b/android/app/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java
index 50202234e9..1e29734243 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java
@@ -109,15 +109,17 @@ public class UserStoryDomainProvider implements DomainProvider {
         }
 
         private boolean matches(UserStory story) {
-            if (mWords.length<=0) return true;
-
-            boolean res = true;
-            for (String word: mWords) {
-                res = res && story.searchText().contains(word);
-                if (!res) break;
+            if (mWords.length <= 0) {
+                return true;
             }
 
-            return res;
+            for (String word : mWords) {
+                if (!story.searchText().contains(word)) {
+                    return false;
+                }
+            }
+
+            return true;
         }
 
         private void addToSuggestions(UserStory story) {