Add filters, fix sort