diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index ec27a2ca0..cfc6346f2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -2483,9 +2483,11 @@ public abstract class BaseMainActivity extends BaseActivity
 
                 List<TagTimeline> tagTimelines = new SearchDAO(BaseMainActivity.this, db).getTabInfo(tabName);
                 String tag;
-                if( tagTimelines == null || tagTimelines.size() == 0)
+                if( tagTimelines == null || tagTimelines.size() == 0) {
                     tag = tabName;
-                else
+                    if(tagTimelines == null)
+                        tagTimelines = new SearchDAO(BaseMainActivity.this, db).getTimelineInfo(tag);
+                }else
                     tag = tagTimelines.get(0).getName();
                 PopupMenu popup = new PopupMenu(BaseMainActivity.this, tabStrip.getChildAt(position));
                 popup.getMenuInflater()
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/SearchDAO.java b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/SearchDAO.java
index 7e1f9e1f7..176d66def 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/SearchDAO.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/sqlite/SearchDAO.java
@@ -56,13 +56,16 @@ public class SearchDAO {
      */
     public void insertSearch(String keyword) {
         ContentValues values = new ContentValues();
-        values.put(Sqlite.COL_KEYWORDS, keyword);
-        values.put(Sqlite.COL_USER_ID, userId);
-        values.put(Sqlite.COL_DATE_CREATION, Helper.dateToString(new Date()));
-        //Inserts search
-        try{
-            db.insert(Sqlite.TABLE_SEARCH, null, values);
-        }catch (Exception ignored) {}
+        if( keyword != null && keyword.trim().length() > 0) {
+            values.put(Sqlite.COL_KEYWORDS, keyword.trim());
+            values.put(Sqlite.COL_USER_ID, userId);
+            values.put(Sqlite.COL_DATE_CREATION, Helper.dateToString(new Date()));
+            //Inserts search
+            try {
+                db.insert(Sqlite.TABLE_SEARCH, null, values);
+            } catch (Exception ignored) {
+            }
+        }
     }
 
 
@@ -83,7 +86,7 @@ public class SearchDAO {
         if( none != null && none.size() > 0)
             values.put(Sqlite.COL_NONE, Helper.arrayToStringStorage(none));
         if( name != null && name.trim().length() > 0)
-            values.put(Sqlite.COL_NAME, name);
+            values.put(Sqlite.COL_NAME, name.trim());
         try{
             db.update(Sqlite.TABLE_SEARCH,  values, Sqlite.COL_USER_ID + " =  ? AND " + Sqlite.COL_KEYWORDS + " = ?", new String[]{userId, tagTimeline.getName()});
         }catch (Exception ignored) {}
@@ -184,9 +187,9 @@ public class SearchDAO {
      * Returns TagTimeline information by its keyword in db
      * @return info List<TagTimeline>
      */
-    public List<TagTimeline> getTabInfo(String keyword){
+    public List<TagTimeline> getTabInfo(String name){
         try {
-            Cursor c = db.query(Sqlite.TABLE_SEARCH, null, Sqlite.COL_NAME + " = \"" + keyword + "\" AND " + Sqlite.COL_USER_ID + " = \"" + userId+ "\"", null, null, null, null, null);
+            Cursor c = db.query(Sqlite.TABLE_SEARCH, null, Sqlite.COL_NAME + " = \"" + name + "\" AND " + Sqlite.COL_USER_ID + " = \"" + userId+ "\"", null, null, null, null, null);
             return cursorToTagTimelineSearch(c);
         } catch (Exception e) {
             return null;