diff --git a/cps/templates/search.html b/cps/templates/search.html
index 78396d80..81ab2d99 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -16,7 +16,7 @@
               </button>
               <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
                 {% for shelf in g.shelves_access %}
-                  {% if not shelf.id in books_shelfs and ( not shelf.is_public or g.user.role_edit_shelfs() ) %}
+                  {% if not shelf.is_public or g.user.role_edit_shelfs() %}
                     <li><a href="{{ url_for('shelf.search_to_shelf', shelf_id=shelf.id) }}"> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
                   {% endif %}
                 {%endfor%}
diff --git a/cps/web.py b/cps/web.py
index 12f3058b..a207a948 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1052,9 +1052,7 @@ def reconnect():
 def search():
     term = request.args.get("query")
     if term:
-        # flask_session['query'] = json.dumps(request.form)
         return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term))
-        # return render_search_results(term, 0, None, config.config_books_per_page)
     else:
         return render_title_template('search.html',
                                      searchterm="",