Fixed match columns to avoid FPs