Fix bug mentioned in issue #162 and another small bug.
Merge branch 'master' into eml_improvements
Implements the category split feature for the eml file download mentioned in #137