other query arg fixes