Bugfixes in sorting options