fix enotice, alter fields if only orgs to be returned