some export feature fixes