WCM-147 Save selected types when there are any