The forcing of IDs to non-draft must happen in base.py instead of draft....

...py.

The draft.py solution only worked when the parent was also in the draft store.