Fix bug in latest download

When metro code was invalid, it would break update script. Also changed offsets as city name should always be last (these changes will require a fresh build of databases).