always put city last due to variable length, add fix for invalid metro code
Merge branch 'metrofix' into paris