Some improvements to search