WL-2777 Fix site ID lookup happening be redirect search.