Added sorting and filtering