Fixing query strings