fixed export image and csv
synced with hermes rc