Cosmetic fixes to the Keyword Search facility