Issue #2275937 by eshta: Added sorting capabilities to agents and option sets loading.