diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index bd63d3f62..d026e5106 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1009,7 +1009,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                         }
 
                         if (theme == Helper.THEME_LIGHT) {
-                            // Todo: use the color 'custom_features_panel_background_light' for white theme
+                            holder.fedilab_features_panel.setBackgroundColor(ContextCompat.getColor(context, R.color.custom_features_panel_background_light));
                         }
 
                         if( !status.iscached()){
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
index bb7ccdbc9..717075839 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
@@ -186,7 +186,10 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
             max_id = "0";
         max_id = String.valueOf(Integer.valueOf(max_id) + 20);
         lv_search_tags.setVisibility(View.VISIBLE);
-        List<String> newTags = apiResponse.getResults().getHashtags();
+        List<String> newTags = new ArrayList<>();
+        if(  apiResponse.getResults() != null) {
+            newTags = apiResponse.getResults().getHashtags();
+        }
         tags.addAll(newTags);
         SearchTagsAdapter searchTagsAdapter = new SearchTagsAdapter(context, tags);
         lv_search_tags.setAdapter(searchTagsAdapter);