diff --git a/lib/toaster/toastergui/templates/detail_pagination_bottom.html b/lib/toaster/toastergui/templates/detail_pagination_bottom.html
index 15adfbc91..ddcba133e 100644
--- a/lib/toaster/toastergui/templates/detail_pagination_bottom.html
+++ b/lib/toaster/toastergui/templates/detail_pagination_bottom.html
@@ -41,8 +41,8 @@
 <script>
  $(document).ready(function() {
     // load data for number of entries to be displayed on page
-    if ({{request.GET.count}} != "") {
-      pagesize = {{request.GET.count}};
+    if ({{validated_pagesize|default:request.GET.count}} != "") {
+      pagesize = {{validated_pagesize|default:request.GET.count}};
     }
     $('.pagesize option').prop('selected', false)
                          .filter('[value="' + pagesize + '"]')
diff --git a/lib/toaster/toastergui/templates/detail_search_header.html b/lib/toaster/toastergui/templates/detail_search_header.html
index 7a9865908..0205b88f6 100644
--- a/lib/toaster/toastergui/templates/detail_search_header.html
+++ b/lib/toaster/toastergui/templates/detail_search_header.html
@@ -31,7 +31,7 @@ $(document).ready(function() {
         <div class="form-group">
           <div class="btn-group">
             <input id="search" class="form-control" type="text" placeholder="Search {{search_what}}" name="search" value="{% if request.GET.search %}{{request.GET.search}}{% endif %}">
-            <input type="hidden" value="name:+" name="orderby">
+            <input type="hidden" value="{{search_orderby|default:'name:+'}}" name="orderby">
             <input type="hidden" value="l" name="page">
             {% if request.GET.search %}
             <span class="remove-search-btn-detail-search search-clear glyphicon glyphicon-remove-circle"></span>