Update locator and title check based on search provider changes. Fixes #736
Merge pull request #737 from davehunt/issue736

Update locator and title check based on search provider changes. Fixes #736