searching improvements