add initial query string parsing code