Added sorting to all listing calls