adding some changes for the search