(Issue 814) Replace 'includeExternal' with general search scopes