more fixes to draft update form, much better now with a lot less DB queries