Little fixes to search