KRACOEUS-7766,KRAFDBCK-9487 - This fix has got unit lookup for Agenda and ordering Agendas depedning on the unit hierarchy : fixing PR comments