Added dictionary search with partial match