Fix query string detection