Merge pull request #372 from wardi/master

restrict use of some logic functions
dataset form fix: hide missing orgs in dropdown
duplicate extras resource update workaround