sangajala- fixed some issues in export