More small fixes to searches