Improved dictionary search.