Handle a few more edge cases with query params