Search functionality

made some changes