Added sorting and filtering options