Added Search feature