Fix mis-named variables
Ensure filter links always work regardless of query param order