Enhancements to the word search