Reverted some changes in agenda feature