Formatting for exports form
Remove "Messages" from list of keys; add at the end if present

Fixes #289
Merge branch 'feature/289' into develop