Add deep parsing of query strings