Issue 433 - Made adjustments for $sitekey-related changes to the Matcher API