Yet other changes to the match API (domain query param)