added some changes for search