added sorting and filtering by name