another search perfomance improvement attempt