Fix query arg handling.