Performance improvement on Agenda fragment