Final bugfix for redirecting to canonical domain when an unknown tenant is requested