Defect fixes and ported to AppDir v 5.2 and v 6.0

1) In previous export tasks were missing, which fixed.
2) Ported to AppDir v 5.2 and v6.0.