search fix bugs