Small fixes to request and query parser.