diff --git a/web/zm_funcs.php b/web/zm_funcs.php
index 9f0629e74..48ef629ec 100644
--- a/web/zm_funcs.php
+++ b/web/zm_funcs.php
@@ -1168,7 +1168,7 @@ function parseSort( $save_to_session=false, $term_sep='&' )
 	}
 	$sort_order = $sort_asc?"asc":"desc";
 	if ( !$sort_asc ) $sort_asc = 0;
-	$sort_query = $term_sep."sort_field=".urlencode($sort_field).$term_sep."sort_asc=".urlencode($sort_asc);
+	$sort_query = $term_sep."sort_field=".$sort_field.$term_sep."sort_asc=".$sort_asc;
 	if ( !isset($limit) )
         $limit = "";
 	if ( $save_to_session )
@@ -1195,19 +1195,19 @@ function parseFilter( &$filter, $save_to_session=false, $term_sep='&' )
 		{
 			if ( isset($filter['terms'][$i]['cnj']) )
 			{
-				$filter['query'] .= $term_sep.urlencode("filter[terms][$i][cnj]=".$filter['terms'][$i]['cnj']);
+				$filter['query'] .= $term_sep."filter[terms][$i][cnj]=".$filter['terms'][$i]['cnj'];
 				$filter['sql'] .= " ".$filter['terms'][$i]['cnj']." ";
 				$filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cnj]\" value=\"".$filter['terms'][$i]['cnj']."\"/>\n";
 			}
 			if ( isset($filter['terms'][$i]['obr']) )
 			{
-				$filter['query'] .= $term_sep.urlencode("filter[terms][$i][obr]=".$filter['terms'][$i]['obr']);
+				$filter['query'] .= $term_sep."filter[terms][$i][obr]=".$filter['terms'][$i]['obr'];
 				$filter['sql'] .= " ".str_repeat( "(", $filter['terms'][$i]['obr'] )." ";
 				$filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][obr]\" value=\"".$filter['terms'][$i]['obr']."\"/>\n";
 			}
 			if ( isset($filter['terms'][$i]['attr']) )
 			{
-				$filter['query'] .= $term_sep.urlencode("filter[terms][$i][attr]=".$filter['terms'][$i]['attr']);
+				$filter['query'] .= $term_sep."filter[terms][$i][attr]=".$filter['terms'][$i]['attr'];
 				$filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][attr]\" value=\"".$filter['terms'][$i]['attr']."\"/>\n";
 				switch ( $filter['terms'][$i]['attr'] )
 				{
@@ -1298,14 +1298,14 @@ function parseFilter( &$filter, $save_to_session=false, $term_sep='&' )
 						break;
 				}
 
-				$filter['query'] .= $term_sep.urlencode("filter[terms][$i][op]=".$filter['terms'][$i]['op']);
+				$filter['query'] .= $term_sep."filter[terms][$i][op]=".$filter['terms'][$i]['op'];
 				$filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][op]\" value=\"".$filter['terms'][$i]['op']."\"/>\n";
-				$filter['query'] .= $term_sep.urlencode("filter[terms][$i][val]=".$filter['terms'][$i]['val']);
+				$filter['query'] .= $term_sep."filter[terms][$i][val]=".urlencode($filter['terms'][$i]['val']);
 				$filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][val]\" value=\"".$filter['terms'][$i]['val']."\"/>\n";
 			}
 			if ( isset($filter['terms'][$i]['cbr']) )
 			{
-				$filter['query'] .= $term_sep.urlencode("filter[terms][$i][cbr]=".$filter['terms'][$i]['cbr']);
+				$filter['query'] .= $term_sep."filter[terms][$i][cbr]=".$filter['terms'][$i]['cbr'];
 				$filter['sql'] .= " ".str_repeat( ")", $filter['terms'][$i]['cbr'] )." ";
 				$filter['fields'] .= "<input type=\"hidden\" \"name=filter[terms][$i][cbr]\" value=\"".$filter['terms'][$i]['cbr']."\"/>\n";
 			}