OAI: https://jspace.atlassian.net/browse/JSPACE-43
OAI dissemainateFormat refactoring