Update CM to do website matching
Fix build
Small changes after review
Merge pull request #1056 from dlondero/issue-1054

Update CM to do website matching