Fixing query string