Many changes for search feature