more search perfomance tweaks