Fixing query params