Small improvements to search