bug fix: use getOrgDefaults() vs. getInstance() to ensure org defaults a...

...re set and fetched