Added search feature back