Fix domains from Baseline HHQ