better search fix