Change the approach to query string parsing