@@ -1488,0 +1489,4 @@
+        default_order_by = get_publisher().get_site_option('default-sort-order') or system_default_order_by
+        if self.view:
+            default_order_by = self.view.order_by or default_order_by
+        return default_order_by

@@ -1488,0 +1498,4 @@
+        if get_request().form.get('q') and not order_by:
+            order_by = 'rank'
+        if not order_by:
+            order_by = default_order_by

@@ -1134,3 +1134,3 @@
 
 def get_order_by_or_400(value):
-    if value is None:
+    if value in (None, ''):

@@ -109,4 +109,0 @@
-  if ($('input[name="order_by"]').length == 0) {
-    /* if we don't have an order_by field, that means we do not support server
-     * side sorting, so we abort here */
-    return;

@@ -132,1 +127,3 @@
-      if (reversed === false) {
+    var new_key = $(this).data('field-sort-key');
+    if (sort_key === new_key) { // same column, reverse on second click, reset on third click
+      if (! reversed) {