Improve column mappings guessing