some fixes to ESS keyword searches.