Fixes #6763 - Correctly choose autocomplete search scope for taxonomies ...

...depenant on controller. 
Corrects scoped search mistakenly setting the wrong class on locations/organizations for auto-complete.