Remove repetitive query string splitting