Repairs

Filters and sort