fix for City, Company columns names