Exporter PDF and Excel expandable issue fix