Added search fix