Added Search functionality