fixing CDM part of #386 (Handle hybrids in data portals)