Improved export links
Merge pull request #2044 from aitboudad/export

Improved export links