Include empty metadata in the editor fields (#787)

This fixes both the old and new editors