Sort rights for bureaucrats and staff

Change-Id: I43d17c771f38abff86806767d8b8a00ee52e63bb