Fix query string select