Agenda Update bugs fixed