Add city and county to output files as requested