Include empty metadata in the editor fields (#787)

This fixes both the old and new editors
Merge pull request #795 from pculture/gh-787

Include empty metadata in the editor fields (#787)