Conflicts fix after merge, added max_participants, eventCostTypes selectfield