needs search fix