refactored formatted responses in Export service