Fixed tags in export