some changes to search