diff --git a/lib/framework/rho/rhoviewhelpers.rb b/lib/framework/rho/rhoviewhelpers.rb
index <HASH>..<HASH> 100644
--- a/lib/framework/rho/rhoviewhelpers.rb
+++ b/lib/framework/rho/rhoviewhelpers.rb
@@ -100,7 +100,12 @@ module Rho
       model = params[:controller] || params[:model] || @request['model'] 
       action = params[:action].nil? ? nil : params[:action].to_s
       id = params[:id].nil? ? nil : params[:id].to_s
-      query = query_to_s(params[:query])
+      if params[:query_s]
+        query = params[:query_s]
+      else
+        query = query_to_s(params[:query])
+      end
+        
       fragment = params[:fragment].nil? ? '' : '#' + params[:fragment]
    
       amurl = ''
[#<I>] - going back after choosing date causes jvm error