Merge pull request #219 from bendiy/master

Make sure org is set in scope selection.
added sales to sanity exceptions
Merge pull request #223 from shackbarth/sanity

added sales to sanity exceptions