diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
index 60f05b15d..2768354a9 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
@@ -348,13 +348,15 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
                     if( statuses != null){
                         statusesNew = new ArrayList<>();
                         for(app.fedilab.android.client.Entities.Status status: statuses){
-                            if (tag != null) {
+                            if (tag != null && !tag.contains("\"")) {
                                 String[] searches = tag.split(" ");
                                 for (String search : searches) {
                                     if (status.getContent().contains(search) || status.getSpoiler_text().contains(search)) {
                                         statusesNew.add(status);
                                     }
                                 }
+                            }else{
+                                statusesNew.addAll(statuses);
                             }
                         }
                     }
diff --git a/app/src/main/java/app/fedilab/android/sqlite/TimelineCacheDAO.java b/app/src/main/java/app/fedilab/android/sqlite/TimelineCacheDAO.java
index 566f26757..1eb082a46 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/TimelineCacheDAO.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/TimelineCacheDAO.java
@@ -19,7 +19,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -167,7 +166,6 @@ public class TimelineCacheDAO {
                     String search = word.replace("\"","");
                     query = new StringBuilder(Sqlite.COL_CACHE + " LIKE '%").append(search).append("%'");
                 }
-
                 if (max_id != null) {
                     c = db.query(Sqlite.TABLE_TIMELINE_CACHE, null, Sqlite.COL_INSTANCE + " = \"" + instance + "\" AND " + Sqlite.COL_USER_ID + " = \"" + userId + "\" AND " + Sqlite.COL_STATUS_ID + " < '" + max_id + "' AND " + query, null, null, null, Sqlite.COL_STATUS_ID + " DESC", "40");
                     return cursorToListStatus(c);