fixed word-search and auto-complete