Feature/fix export small issues

Based on ; https://www.pivotaltracker.com/n/projects/475319/stories/79387526