[BUGFIX] ADWD-1158 Fix sorting of aemters