Fixes #25, bill city in ETL