EventService Corrected, FieldSelectionService added