Fixes David's issue.
Fixes null fields and improves JSON results.
Merge pull request #389 from LearningLocker/issue/exports

Fixes null fields and improves JSON results.