Issue #2126 - handle multiple URLs for same site