BS-11623
Fix combo sort for listeners