better search fixed