Search feature enhancement
Enhance search feature