more export service enhancements