Implement proper handling of agenda markers when using sticky agendas