Hotfix/remove sort

Fixes firewall support. Tested in production... ;-)