diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 528b60a72..c2bf61463 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -590,7 +590,7 @@ header {
     text-align: left;
 
     @include breakpoint(medium) {
-      margin-right: $line-height * 1.5;
+      margin-right: rem-calc(24);
     }
 
     &:hover {
diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb
index 4bbbe3873..f313fcaf2 100644
--- a/app/controllers/concerns/commentable_actions.rb
+++ b/app/controllers/concerns/commentable_actions.rb
@@ -4,15 +4,14 @@ module CommentableActions
   include Search
 
   def index
-    @resources = @search_terms.present? ? resource_model.search(@search_terms) : resource_model.all
-    @resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources
+    @resources = resource_model.all
 
+    @resources = @current_order == "recommended" && current_user.present? ? @resources.recommended(current_user) : @resources.for_render
+    @resources = @resources.search(@search_terms) if @search_terms.present?
+    @resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources
     @resources = @resources.tagged_with(@tag_filter) if @tag_filter
-    @resources =  if @current_order == "recommended" && current_user.present?
-                    @resources.recommended(current_user).page(params[:page]).send("sort_by_#{@current_order}")
-                  else
-                    @resources.page(params[:page]).for_render.send("sort_by_#{@current_order}")
-                  end
+
+    @resources = @resources.page(params[:page]).send("sort_by_#{@current_order}")
 
     index_customization if index_customization.present?
 
diff --git a/app/models/debate.rb b/app/models/debate.rb
index bf5253b88..805795606 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -49,7 +49,7 @@ class Debate < ActiveRecord::Base
 
   def self.recommended(user)
     debates_list = where("author_id != ?", user.id)
-    #same as "with_tagged(user.interests, any: true)"
+    # same as tagged_with(user.interests, any: true) 
     debates_list_with_tagged = debates_list.joins(:tags).where('taggings.taggable_type = ?', self.name).where('tags.name IN (?)', user.interests)
     if debates_list_with_tagged.any?
       debates_list = debates_list_with_tagged
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index 1e42f673d..c3a75aedf 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -59,6 +59,7 @@ class Proposal < ActiveRecord::Base
 
   def self.recommended(user)
     proposals_list = where("author_id != ?", user.id)
+    # same as tagged_with(user.interests, any: true) 
     proposals_list_with_tagged = proposals_list.joins(:tags).where('taggings.taggable_type = ?', self.name)
                                                             .where('tags.name IN (?)', user.interests)
     if proposals_list_with_tagged.any?