Add export hash type values. Fix export to json (trim keys)