Admin UI better sort handling (thanks Dingjie Yang)