Fix and quote the compound matcher