Fix import column matching.