Merge pull request #207 from daviddavis/temp/20140722125225
Fixes #6451,BZ1114757 - Cleaning up org search options methods
Merge pull request #207 from daviddavis/temp/20140722125225
Fixes #6451,BZ1114757 - Cleaning up org search options methods