Make sure draft is draft and live is live etc.

Fix bug with name mixup.