Fixing bugs with the draft listing and draft saving