HCSVLAB-364: improved performance on simple term searches.