Big improvement to query parsing strategy of unfielded tokens