Small improvement for exporting of metadata