Initial search fix`