Word Searching related upgrade.