fixing query strings