Adjust agendas_for, closes #3911