Exporter Expandable issues fixed