Added search and sort features