slightly improved search