+ some cleanup of redundant code
+ [OE-3467] enable setting of defaults for various fields (note, requires data inserts to be carried out to have functional effect)