upstream fixes to js query parser in autocomplete