(Hilary Issue 814) Use search scope instead of 'includeExternal' for general search and interact search
Merge branch 'hilary-issue-814' of https://github.com/mrvisser/3akai-ux into hilary-issue-814