Bug fixed query parameter filtering and formatting