Added search, sorting (not finished)