Remove support on server side for filter parameter and replace with query since they are both the same.  Rewrite BuildURL function  to only use query