sorting and filtering working again