From 3f9efb9094052eb7cc01159145f5ff91135de3fd Mon Sep 17 00:00:00 2001
From: midzer <midzer@gmail.com>
Date: Thu, 12 Dec 2024 12:08:33 +0100
Subject: [PATCH] update content and data

---
 .../alexandria/georges-restaurant-equipment.md |  5 +++++
 .../alexandria/hair-cuttery-rose-hill-drive.md |  5 +++++
 .../hair-cuttery-south-van-dorn-street.md      |  5 -----
 content/cities/baskerville/_index.md           |  6 ++++++
 content/cities/baskerville/triangle-grocery.md |  5 +++++
 content/cities/boydton/_index.md               |  6 ++++++
 content/cities/boydton/triangle-grocery.md     |  5 +++++
 content/cities/buffalo-junction/_index.md      |  6 ++++++
 .../buffalo-junction/bowens-mini-mart-ii.md    |  5 +++++
 .../cities/charlottesville/blue-whale-books.md |  5 +++++
 .../cities/charlottesville/heartwood-books.md  |  5 +++++
 .../charlottesville/hello-comics-downtown.md   |  5 +++++
 ...round-vintage-clothing-and-strange-cargo.md |  5 -----
 .../oakleys-gently-used-books.md               |  5 -----
 ...raph-art-and-comics-4th-street-northeast.md |  5 -----
 ...to-parts-george-washington-highway-south.md |  5 -----
 ...ance-auto-parts-western-branch-boulevard.md |  5 +++++
 content/cities/chesapeake/dollar-tree-2.md     |  5 +++++
 .../firestone-chesapeake-square-ring-road.md   |  5 +++++
 .../chesapeake/firestone-hillcrest-parkway.md  |  5 -----
 .../kramer-tire-battlefield-boulevard-north.md |  5 -----
 .../kramer-tire-western-branch-boulevard.md    |  5 +++++
 .../chesapeake/mattress-firm-carmichael-way.md |  5 +++++
 .../mattress-firm-crossways-boulevard.md       |  5 -----
 .../the-home-depot-hillcrest-parkway.md        |  5 -----
 .../the-home-depot-old-taylor-road.md          |  5 +++++
 .../wawa-western-branch-boulevard.md           |  5 +++++
 .../clarksville/7-eleven-virginia-avenue.md    |  5 +++++
 .../7-eleven.md                                |  2 +-
 content/cities/clarksville/_index.md           |  4 ++--
 content/cities/clarksville/a2z-hobby.md        |  5 +++++
 content/cities/clarksville/aplus.md            |  5 -----
 content/cities/clarksville/art-and-books.md    |  5 +++++
 ...buggs-island-baby-and-childrens-clothing.md |  5 +++++
 .../buggs-island-bait-and-tackle.md            |  5 +++++
 .../clarksville/clarksville-ace-hardware.md    |  5 +++++
 .../clarksville/clarksville-coin-laundry.md    |  5 +++++
 .../clarksville/clarksville-discount-outlet.md |  5 +++++
 .../clarksville/clarksville-furniture-co.md    |  5 +++++
 .../clarksville/clarksville-hair-salon.md      |  5 +++++
 .../clarksville-ruritan-club-thrift-shop.md    |  5 +++++
 .../dollar-general.md}                         |  2 +-
 .../food-lion.md}                              |  2 +-
 .../grandfathers-country-creations.md          |  5 +++++
 .../clarksville/lake-country-barber-shop.md    |  5 +++++
 content/cities/clarksville/moores-chevrolet.md |  5 +++++
 content/cities/clarksville/sweet-violet.md     |  5 +++++
 .../cities/clarksville/the-antique-market.md   |  5 +++++
 .../clarksville/the-corner-at-two-one-six.md   |  5 +++++
 .../the-hound-and-quill-trading-company.md     |  5 +++++
 content/cities/clarksville/verizon.md          |  5 +++++
 .../virginia-abc.md}                           |  2 +-
 .../cities/clarksville/virginia-avenue-mall.md |  5 +++++
 .../watkins-cooper-lyon-funeral-home.md        |  5 +++++
 .../ace-hardware-cleburne-boulevard.md}        |  2 +-
 .../dollar-general.md}                         |  2 +-
 content/cities/dublin/dollar-tree.md           |  5 +++++
 .../dublin/maria-bonita-tienda-mexicana.md     |  5 +++++
 content/cities/dublin/oreilly-auto-parts.md    |  5 +++++
 content/cities/dublin/shop-eez.md              |  5 +++++
 .../cities/dublin/top-shelf-nail-service.md    |  5 +++++
 content/cities/dublin/verizon.md               |  5 +++++
 content/cities/dublin/virginia-abc.md          |  5 +++++
 content/cities/fairfield/_index.md             |  4 ++--
 .../falls-church/old-brick-house-square.md     |  5 +++++
 .../firestone-patriot-highway.md               |  5 +++++
 .../fredericksburg/firestone-plank-road.md     |  5 -----
 .../speedway-north-shenandoah-avenue.md        |  5 -----
 .../speedway-south-commerce-avenue.md          |  5 +++++
 content/cities/great-falls/_index.md           |  4 ++--
 ...d => extra-space-storage-lasalle-avenue.md} |  2 +-
 content/cities/hampton/farm-fresh.md           |  5 -----
 .../food-lion-east-mercury-boulevard.md        |  5 +++++
 .../family-dollar-chicago-avenue.md            |  5 +++++
 .../family-dollar-south-main-street.md         |  5 -----
 ...hn-rolfe-parkway.md => publix-pump-road.md} |  2 +-
 .../7-eleven-merrimac-trail.md                 |  5 -----
 .../7-eleven-richmond-road.md                  |  5 +++++
 content/cities/james-city-county/_index.md     |  4 ++--
 .../lexington/cocoa-mill-chocolate-company.md  |  5 -----
 content/cities/lively/_index.md                |  4 ++--
 .../manassas/mattress-firm-liberia-avenue-2.md |  5 +++++
 .../mattress-firm-sowder-village-square.md     |  5 -----
 content/cities/mecklenburg-county/_index.md    |  6 ------
 .../midlothian/kroger-midlothian-turnpike.md   |  5 +++++
 .../midlothian/kroger-rittenhouse-drive.md     |  5 -----
 .../wawa-pike-view-drive.md}                   |  2 +-
 .../midlothian/wawa-southshore-pointe-drive.md |  5 -----
 content/cities/nathalie/_index.md              |  4 ++--
 ...ce-auto-service-center-warwick-boulevard.md |  5 -----
 content/cities/newport-news/tire-choice.md     |  5 +++++
 .../cvs-pharmacy-east-little-creek-road-2.md   |  5 -----
 ...s-pharmacy-east-virginia-beach-boulevard.md |  5 +++++
 .../norfolk/rite-aid-east-little-creek-road.md |  5 -----
 .../cities/norfolk/rite-aid-tidewater-drive.md |  5 +++++
 .../norfolk/wawa-east-little-creek-road.md     |  5 -----
 .../norfolk/wawa-north-military-highway-2.md   |  5 +++++
 .../north-chesterfield/kroger-hicks-road.md    |  5 -----
 .../north-chesterfield/kroger-tim-price-way.md |  5 +++++
 content/cities/norton/_index.md                |  4 ++--
 content/cities/portsmouth/book-nook.md         |  5 +++++
 .../cities/portsmouth/book-owl-bookstore.md    |  5 +++++
 .../cities/portsmouth/harris-tire-service.md   |  5 +++++
 content/cities/portsmouth/land-and-coates.md   |  5 +++++
 content/cities/portsmouth/number-one-nails.md  |  5 +++++
 .../portsmouth/rite-aid-airline-boulevard.md   |  5 -----
 content/cities/portsmouth/virginia-abc.md      |  5 +++++
 .../cities/portsmouth/warrant-realty-inc.md    |  5 -----
 .../portsmouth/wawa-frederick-boulevard.md     |  5 -----
 .../portsmouth/wawa-victory-boulevard.md       |  5 +++++
 content/cities/powhatan/_index.md              |  2 +-
 .../powhatan/food-lion-south-creek-one.md      |  5 +++++
 .../powhatan/virginia-abc-south-creek-one.md   |  5 +++++
 content/cities/quinton/_index.md               |  4 ++--
 .../cities/quinton/brooks-stitch-and-fold.md   |  5 +++++
 .../hawthorne-laundry-and-dry-cleaners.md      |  5 -----
 content/cities/quinton/margeauxs-florist.md    |  5 -----
 content/cities/quinton/new-kent-floral.md      |  5 +++++
 ...ton-road.md => 7-eleven-north-arch-road.md} |  2 +-
 .../cities/richmond/walgreens-brook-road.md    |  5 +++++
 .../richmond/walgreens-hull-street-road.md     |  5 -----
 .../richmond/wawa-midlothian-turnpike-2.md     |  5 -----
 .../cities/richmond/wawa-west-broad-street.md  |  5 +++++
 content/cities/roanoke/_index.md               |  2 +-
 .../petsmart-franklin-road-southwest.md        |  5 -----
 ...petsmart-valley-view-boulevard-northwest.md |  5 +++++
 .../cities/roanoke/united-truck-repair-llc.md  |  2 +-
 .../7-eleven-east-williamsburg-road.md         |  5 -----
 .../sandston/7-eleven-south-airport-drive.md   |  5 +++++
 .../dollar-general-south-church-street.md      |  5 +++++
 .../blue-ridge-tobacco-and-candle.md           |  5 +++++
 .../cities/south-boston/cricket-wireless.md    |  5 +++++
 content/cities/south-boston/food-lion.md       |  5 +++++
 .../cities/south-boston/new-york-fashion.md    |  5 +++++
 .../cities/south-boston/reaves-trophy-shop.md  |  5 +++++
 .../riverdale-laundry-land-laundromat.md       |  5 +++++
 .../smileys-general-merchandise.md             |  5 +++++
 .../cities/south-boston/smokers-vape-plus.md   |  5 +++++
 content/cities/south-boston/va-nails.md        |  5 +++++
 content/cities/stafford/_index.md              |  4 ++--
 .../wawa-eustace-road.md}                      |  2 +-
 .../suffolk/dollar-general-wilroy-road.md      |  5 +++++
 content/cities/urbanna/_index.md               |  2 +-
 .../cities/vienna/7-eleven-leesburg-pike-2.md  |  5 -----
 .../vienna/7-eleven-park-street-southeast.md   |  5 +++++
 content/cities/vienna/_index.md                |  4 ++--
 content/cities/virginia-beach/_index.md        |  4 ++--
 .../virginia-beach/food-lion-holland-road.md   |  5 +++++
 .../food-lion-north-great-neck-road.md         |  5 -----
 .../virginia-beach/kroger-shore-drive.md       |  5 +++++
 .../kroger-virginia-beach-boulevard.md         |  5 -----
 .../rite-aid-south-rosemont-road.md            |  5 +++++
 .../virginia-beach/rite-aid-upton-drive.md     |  5 -----
 .../verizon-independence-boulevard.md          |  5 -----
 .../verizon-virginia-beach-boulevard.md        |  5 +++++
 content/cities/warrenton/_index.md             |  4 ++--
 content/cities/winchester/_index.md            |  4 ++--
 content/cities/woodbridge/joy-day-spa.md       |  5 +++++
 content/cities/woodbridge/joy-nail-spa.md      |  5 +++++
 content/cities/woodbridge/locksmith-outlet.md  |  5 +++++
 .../woodbridge/yegna-ethiopian-market.md       |  5 +++++
 ...leven-george-washington-memorial-highway.md |  5 -----
 .../abingdon/fas-mart-porterfield-highway.yml  | 10 +++++-----
 data/cities/abingdon/fas-mart.yml              | 10 +++++-----
 .../georges-restaurant-equipment.yml           | 11 +++++++++++
 .../hair-cuttery-rose-hill-drive.yml           | 11 +++++++++++
 .../hair-cuttery-south-van-dorn-street.yml     | 11 -----------
 data/cities/alexandria/hair-cuttery.yml        | 12 ++++++------
 .../7-eleven-washington-boulevard-2.yml        | 14 +++++++-------
 .../7-eleven-washington-boulevard.yml          | 14 +++++++-------
 .../arlington/7-eleven-wilson-boulevard-2.yml  | 16 ++++++++--------
 .../arlington/7-eleven-wilson-boulevard.yml    | 16 ++++++++--------
 data/cities/baskerville/triangle-grocery.yml   | 11 +++++++++++
 .../boston/elliotts-auto-and-equipment.yml     |  2 +-
 data/cities/boydton/triangle-grocery.yml       | 11 +++++++++++
 .../buffalo-junction/bowens-mini-mart-ii.yml   | 11 +++++++++++
 .../charlottesville/blue-whale-books.yml       | 11 +++++++++++
 .../cities/charlottesville/heartwood-books.yml | 11 +++++++++++
 .../charlottesville/hello-comics-downtown.yml  | 11 +++++++++++
 ...ound-vintage-clothing-and-strange-cargo.yml | 11 -----------
 .../oakleys-gently-used-books.yml              | 11 -----------
 ...aph-art-and-comics-4th-street-northeast.yml | 11 -----------
 .../twisted-branch-tea-bazaar.yml              |  2 +-
 .../7-eleven-bainbridge-boulevard-2.yml        | 12 ++++++------
 .../7-eleven-bainbridge-boulevard.yml          | 12 ++++++------
 ...o-parts-george-washington-highway-south.yml | 11 -----------
 ...nce-auto-parts-western-branch-boulevard.yml | 11 +++++++++++
 data/cities/chesapeake/advance-auto-parts.yml  | 14 +++++++-------
 data/cities/chesapeake/dollar-tree-2.yml       | 11 +++++++++++
 data/cities/chesapeake/dollar-tree.yml         | 18 +++++++++---------
 .../firestone-chesapeake-square-ring-road.yml  | 11 +++++++++++
 .../chesapeake/firestone-hillcrest-parkway.yml | 11 -----------
 data/cities/chesapeake/firestone.yml           | 12 ++++++------
 ...kramer-tire-battlefield-boulevard-north.yml | 11 -----------
 .../kramer-tire-western-branch-boulevard.yml   | 11 +++++++++++
 data/cities/chesapeake/kramer-tire.yml         | 12 ++++++------
 .../mattress-firm-carmichael-way.yml           | 11 +++++++++++
 .../mattress-firm-crossways-boulevard.yml      | 11 -----------
 data/cities/chesapeake/mattress-firm.yml       | 16 ++++++++--------
 .../the-home-depot-hillcrest-parkway.yml       | 11 -----------
 .../the-home-depot-old-taylor-road.yml         | 11 +++++++++++
 data/cities/chesapeake/the-home-depot.yml      | 16 ++++++++--------
 .../wawa-western-branch-boulevard.yml          | 11 +++++++++++
 data/cities/chesapeake/wawa-woodlake-drive.yml | 11 -----------
 data/cities/chesapeake/wawa.yml                | 16 ++++++++--------
 .../7-eleven-virginia-avenue.yml}              |  4 ++--
 .../clarksville/{aplus.yml => 7-eleven.yml}    |  8 ++++----
 data/cities/clarksville/a2z-hobby.yml          | 11 +++++++++++
 data/cities/clarksville/art-and-books.yml      | 11 +++++++++++
 ...uggs-island-baby-and-childrens-clothing.yml | 11 +++++++++++
 .../buggs-island-bait-and-tackle.yml           | 12 ++++++++++++
 ...rdware.yml => clarksville-ace-hardware.yml} |  2 +-
 .../clarksville/clarksville-coin-laundry.yml   | 11 +++++++++++
 .../clarksville-discount-outlet.yml            | 11 +++++++++++
 .../clarksville/clarksville-furniture-co.yml   | 11 +++++++++++
 .../clarksville/clarksville-hair-salon.yml     | 11 +++++++++++
 .../clarksville-ruritan-club-thrift-shop.yml   | 11 +++++++++++
 data/cities/clarksville/dollar-general.yml     | 11 +++++++++++
 data/cities/clarksville/food-lion.yml          | 11 +++++++++++
 .../grandfathers-country-creations.yml         | 11 +++++++++++
 .../clarksville/hites-clothing-store.yml       |  4 ++--
 .../clarksville/lake-country-barber-shop.yml   | 11 +++++++++++
 data/cities/clarksville/moores-chevrolet.yml   | 11 +++++++++++
 data/cities/clarksville/oreilly-auto-parts.yml |  2 +-
 data/cities/clarksville/sweet-violet.yml       | 11 +++++++++++
 data/cities/clarksville/the-antique-market.yml | 11 +++++++++++
 .../clarksville/the-corner-at-two-one-six.yml  | 11 +++++++++++
 .../the-hound-and-quill-trading-company.yml    | 11 +++++++++++
 .../clarksville/tractor-supply-company.yml     |  2 +-
 data/cities/clarksville/verizon.yml            | 11 +++++++++++
 data/cities/clarksville/virginia-abc.yml       | 11 +++++++++++
 .../clarksville/virginia-avenue-mall.yml       | 11 +++++++++++
 .../watkins-cooper-lyon-funeral-home.yml       | 11 +++++++++++
 .../dublin/ace-hardware-cleburne-boulevard.yml | 11 +++++++++++
 data/cities/dublin/ace-hardware.yml            |  4 ++--
 data/cities/dublin/dollar-general.yml          | 11 +++++++++++
 data/cities/dublin/dollar-tree.yml             | 11 +++++++++++
 .../dublin/maria-bonita-tienda-mexicana.yml    | 11 +++++++++++
 data/cities/dublin/oreilly-auto-parts.yml      | 11 +++++++++++
 data/cities/dublin/shop-eez.yml                | 11 +++++++++++
 data/cities/dublin/top-shelf-nail-service.yml  | 11 +++++++++++
 data/cities/dublin/verizon.yml                 | 11 +++++++++++
 data/cities/dublin/virginia-abc.yml            | 11 +++++++++++
 .../falls-church/old-brick-house-square.yml    | 11 +++++++++++
 .../firestone-patriot-highway.yml              | 11 +++++++++++
 .../fredericksburg/firestone-plank-road.yml    | 11 -----------
 data/cities/fredericksburg/firestone.yml       | 14 +++++++-------
 .../speedway-north-shenandoah-avenue.yml       | 11 -----------
 .../speedway-south-commerce-avenue.yml         | 11 +++++++++++
 data/cities/front-royal/speedway.yml           | 14 +++++++-------
 data/cities/gainesville/la-z-boy.yml           |  4 ++--
 data/cities/gainesville/ulta-beauty.yml        |  4 ++--
 .../hampton/7-eleven-north-king-street-2.yml   | 10 +++++-----
 .../hampton/7-eleven-north-king-street.yml     | 10 +++++-----
 .../extra-space-storage-cunningham-drive.yml   | 11 -----------
 .../extra-space-storage-lasalle-avenue.yml     | 11 +++++++++++
 data/cities/hampton/extra-space-storage.yml    | 12 ++++++------
 ...ml => food-lion-east-mercury-boulevard.yml} |  4 ++--
 .../family-dollar-chicago-avenue.yml           | 11 +++++++++++
 .../family-dollar-south-main-street.yml        | 11 -----------
 data/cities/harrisonburg/family-dollar.yml     | 16 ++++++++--------
 .../henrico/publix-john-rolfe-parkway.yml      | 11 -----------
 data/cities/henrico/publix-pump-road.yml       | 11 +++++++++++
 data/cities/henrico/publix.yml                 | 18 +++++++++---------
 .../7-eleven-merrimac-trail.yml                | 11 -----------
 .../7-eleven-richmond-road.yml                 | 11 +++++++++++
 data/cities/james-city-county/7-eleven.yml     | 16 ++++++++--------
 .../lexington/cocoa-mill-chocolate-company.yml | 11 -----------
 .../mattress-firm-liberia-avenue-2.yml         | 11 +++++++++++
 .../manassas/mattress-firm-liberia-avenue.yml  | 10 +++++-----
 .../mattress-firm-sowder-village-square.yml    | 11 -----------
 data/cities/manassas/mattress-firm.yml         | 18 +++++++++---------
 .../midlothian/kroger-midlothian-turnpike.yml  | 11 +++++++++++
 .../midlothian/kroger-rittenhouse-drive.yml    | 11 -----------
 data/cities/midlothian/kroger.yml              | 18 +++++++++---------
 .../cities/midlothian/wawa-pike-view-drive.yml | 11 +++++++++++
 .../wawa-southshore-pointe-drive.yml           | 11 -----------
 data/cities/midlothian/wawa.yml                | 16 ++++++++--------
 .../7-eleven-jefferson-avenue-2.yml            | 12 ++++++------
 .../7-eleven-jefferson-avenue-3.yml            | 14 +++++++-------
 .../7-eleven-jefferson-avenue-4.yml            | 14 +++++++-------
 .../7-eleven-jefferson-avenue-5.yml            | 14 +++++++-------
 .../newport-news/7-eleven-jefferson-avenue.yml | 14 +++++++-------
 .../7-eleven-warwick-boulevard-2.yml           | 16 ++++++++--------
 .../7-eleven-warwick-boulevard-3.yml           | 16 ++++++++--------
 .../7-eleven-warwick-boulevard-4.yml           | 16 ++++++++--------
 .../7-eleven-warwick-boulevard-5.yml           | 14 +++++++-------
 .../7-eleven-warwick-boulevard-6.yml           | 14 +++++++-------
 .../firestone-warwick-boulevard.yml            | 14 +++++++-------
 data/cities/newport-news/firestone.yml         | 14 +++++++-------
 .../newport-news/t-mobile-jefferson-avenue.yml | 10 +++++-----
 data/cities/newport-news/t-mobile.yml          | 10 +++++-----
 ...e-auto-service-center-warwick-boulevard.yml | 11 -----------
 .../tire-choice-auto-service-center.yml        | 14 +++++++-------
 data/cities/newport-news/tire-choice.yml       | 11 +++++++++++
 .../cvs-pharmacy-east-little-creek-road-2.yml  | 11 -----------
 .../cvs-pharmacy-east-little-creek-road.yml    | 10 +++++-----
 ...-pharmacy-east-virginia-beach-boulevard.yml | 11 +++++++++++
 data/cities/norfolk/cvs-pharmacy.yml           | 14 +++++++-------
 .../rite-aid-east-little-creek-road.yml        | 11 -----------
 .../norfolk/rite-aid-tidewater-drive.yml       | 11 +++++++++++
 data/cities/norfolk/rite-aid.yml               | 14 +++++++-------
 .../norfolk/wawa-east-little-creek-road.yml    | 11 -----------
 .../norfolk/wawa-north-military-highway-2.yml  | 11 +++++++++++
 .../norfolk/wawa-north-military-highway.yml    | 16 ++++++++--------
 data/cities/norfolk/wawa.yml                   | 12 ++++++------
 .../north-chesterfield/kroger-hicks-road.yml   | 11 -----------
 .../kroger-tim-price-way.yml                   | 11 +++++++++++
 data/cities/north-chesterfield/kroger.yml      | 18 +++++++++---------
 data/cities/portsmouth/book-nook.yml           | 11 +++++++++++
 data/cities/portsmouth/book-owl-bookstore.yml  | 11 +++++++++++
 data/cities/portsmouth/harris-tire-service.yml | 11 +++++++++++
 data/cities/portsmouth/land-and-coates.yml     | 11 +++++++++++
 data/cities/portsmouth/number-one-nails.yml    | 11 +++++++++++
 .../portsmouth/rite-aid-airline-boulevard.yml  | 11 -----------
 data/cities/portsmouth/rite-aid.yml            | 12 ++++++------
 data/cities/portsmouth/virginia-abc.yml        | 11 +++++++++++
 data/cities/portsmouth/warrant-realty-inc.yml  | 11 -----------
 .../portsmouth/wawa-frederick-boulevard.yml    | 11 -----------
 .../portsmouth/wawa-victory-boulevard.yml      | 11 +++++++++++
 data/cities/portsmouth/wawa.yml                | 16 ++++++++--------
 .../cities/powhatan/food-lion-academy-road.yml | 11 -----------
 .../powhatan/food-lion-south-creek-one.yml     | 11 +++++++++++
 data/cities/powhatan/food-lion.yml             | 16 ++++++++--------
 .../powhatan/virginia-abc-academy-road.yml     | 11 -----------
 .../powhatan/virginia-abc-south-creek-one.yml  | 11 +++++++++++
 data/cities/powhatan/virginia-abc.yml          | 14 +++++++-------
 .../cities/quinton/beyond-nail-and-day-spa.yml |  5 +++--
 ...cleaners.yml => brooks-stitch-and-fold.yml} |  8 ++++----
 data/cities/quinton/dollar-general-market.yml  |  8 ++++----
 data/cities/quinton/food-lion.yml              |  2 +-
 ...rgeauxs-florist.yml => new-kent-floral.yml} |  8 ++++----
 data/cities/quinton/salon-249.yml              |  6 +++---
 .../quinton/verizon-authorized-retailer.yml    |  6 +++---
 data/cities/quinton/virginia-abc.yml           |  6 +++---
 data/cities/richmond/7-eleven-gayton-road.yml  | 11 -----------
 .../richmond/7-eleven-north-arch-road.yml      | 11 +++++++++++
 data/cities/richmond/7-eleven.yml              | 16 ++++++++--------
 data/cities/richmond/walgreens-brook-road.yml  | 11 +++++++++++
 .../richmond/walgreens-hull-street-road.yml    | 11 -----------
 data/cities/richmond/walgreens.yml             | 14 +++++++-------
 .../richmond/wawa-midlothian-turnpike-2.yml    | 11 -----------
 .../richmond/wawa-midlothian-turnpike.yml      | 12 ++++++------
 .../cities/richmond/wawa-west-broad-street.yml | 11 +++++++++++
 data/cities/richmond/wawa.yml                  | 14 +++++++-------
 .../petsmart-franklin-road-southwest.yml       | 11 -----------
 ...etsmart-valley-view-boulevard-northwest.yml | 11 +++++++++++
 data/cities/roanoke/petsmart.yml               | 18 +++++++++---------
 .../7-eleven-east-williamsburg-road.yml        | 11 -----------
 .../sandston/7-eleven-south-airport-drive.yml  | 11 +++++++++++
 data/cities/sandston/7-eleven.yml              | 16 ++++++++--------
 .../dollar-general-south-church-street.yml     | 11 +++++++++++
 .../dollar-general-west-main-street.yml        | 11 -----------
 data/cities/smithfield/dollar-general.yml      | 16 ++++++++--------
 .../blue-ridge-tobacco-and-candle.yml          | 11 +++++++++++
 data/cities/south-boston/cricket-wireless.yml  | 11 +++++++++++
 data/cities/south-boston/dollar-general.yml    |  8 ++++----
 data/cities/south-boston/food-lion.yml         | 11 +++++++++++
 data/cities/south-boston/new-york-fashion.yml  | 11 +++++++++++
 .../cities/south-boston/reaves-trophy-shop.yml | 11 +++++++++++
 .../riverdale-laundry-land-laundromat.yml      | 11 +++++++++++
 .../smileys-general-merchandise.yml            | 11 +++++++++++
 data/cities/south-boston/smokers-vape-plus.yml | 11 +++++++++++
 data/cities/south-boston/va-nails.yml          | 11 +++++++++++
 data/cities/stafford/aldi.yml                  |  6 +++---
 data/cities/stafford/harbor-freight-tools.yml  |  6 +++---
 .../stafford/the-icing-baking-company.yml      |  6 +++---
 .../cities/stafford/wawa-austin-park-drive.yml | 11 -----------
 data/cities/stafford/wawa-eustace-road.yml     | 11 +++++++++++
 data/cities/stafford/wawa.yml                  | 16 ++++++++--------
 data/cities/sterling/massage-pros.yml          |  2 +-
 .../dollar-general-godwin-boulevard.yml        | 11 -----------
 .../suffolk/dollar-general-wilroy-road.yml     | 11 +++++++++++
 data/cities/suffolk/dollar-general.yml         | 14 +++++++-------
 .../cities/vienna/7-eleven-leesburg-pike-2.yml | 11 -----------
 data/cities/vienna/7-eleven-leesburg-pike.yml  | 14 +++++++-------
 .../vienna/7-eleven-park-street-southeast.yml  | 11 +++++++++++
 data/cities/vienna/7-eleven.yml                | 16 ++++++++--------
 data/cities/virginia-beach/7-eleven-3.yml      |  8 ++++----
 data/cities/virginia-beach/7-eleven-4.yml      |  8 ++++----
 data/cities/virginia-beach/7-eleven-5.yml      |  8 ++++----
 data/cities/virginia-beach/7-eleven-6.yml      |  8 ++++----
 data/cities/virginia-beach/7-eleven-7.yml      |  6 +++---
 .../virginia-beach/7-eleven-holland-road-2.yml | 14 +++++++-------
 .../virginia-beach/7-eleven-holland-road-3.yml | 14 +++++++-------
 .../virginia-beach/7-eleven-holland-road-4.yml | 14 +++++++-------
 .../7-eleven-princess-anne-road-2.yml          |  8 ++++----
 .../7-eleven-princess-anne-road.yml            |  8 ++++----
 .../7-eleven-virginia-beach-boulevard-2.yml    | 16 ++++++++--------
 .../7-eleven-virginia-beach-boulevard.yml      | 16 ++++++++--------
 .../virginia-beach/food-lion-holland-road.yml  | 11 +++++++++++
 .../food-lion-north-great-neck-road.yml        | 11 -----------
 data/cities/virginia-beach/food-lion.yml       | 16 ++++++++--------
 data/cities/virginia-beach/harris-teeter-2.yml | 12 ++++++------
 data/cities/virginia-beach/harris-teeter-3.yml | 12 ++++++------
 .../virginia-beach/kroger-shore-drive.yml      | 11 +++++++++++
 .../kroger-virginia-beach-boulevard.yml        | 11 -----------
 data/cities/virginia-beach/kroger.yml          | 18 +++++++++---------
 .../rite-aid-south-rosemont-road.yml           | 11 +++++++++++
 .../virginia-beach/rite-aid-upton-drive.yml    | 11 -----------
 data/cities/virginia-beach/rite-aid.yml        | 16 ++++++++--------
 .../verizon-independence-boulevard.yml         | 11 -----------
 .../verizon-virginia-beach-boulevard.yml       | 11 +++++++++++
 data/cities/virginia-beach/verizon.yml         | 16 ++++++++--------
 .../wawa-virginia-beach-boulevard-2.yml        | 14 +++++++-------
 .../wawa-virginia-beach-boulevard.yml          | 14 +++++++-------
 data/cities/woodbridge/joy-day-spa.yml         | 11 +++++++++++
 data/cities/woodbridge/joy-nail-spa.yml        | 11 +++++++++++
 data/cities/woodbridge/locksmith-outlet.yml    | 11 +++++++++++
 .../woodbridge/yegna-ethiopian-market.yml      | 11 +++++++++++
 .../walgreens-geo-wash-mem-highway.yml         | 12 ++++++------
 data/cities/york-county/walgreens.yml          | 12 ++++++------
 ...even-george-washington-memorial-highway.yml | 11 -----------
 data/cities/yorktown/7-eleven.yml              | 10 +++++-----
 414 files changed, 2224 insertions(+), 1378 deletions(-)
 create mode 100644 content/cities/alexandria/georges-restaurant-equipment.md
 create mode 100644 content/cities/alexandria/hair-cuttery-rose-hill-drive.md
 delete mode 100644 content/cities/alexandria/hair-cuttery-south-van-dorn-street.md
 create mode 100644 content/cities/baskerville/_index.md
 create mode 100644 content/cities/baskerville/triangle-grocery.md
 create mode 100644 content/cities/boydton/_index.md
 create mode 100644 content/cities/boydton/triangle-grocery.md
 create mode 100644 content/cities/buffalo-junction/_index.md
 create mode 100644 content/cities/buffalo-junction/bowens-mini-mart-ii.md
 create mode 100644 content/cities/charlottesville/blue-whale-books.md
 create mode 100644 content/cities/charlottesville/heartwood-books.md
 create mode 100644 content/cities/charlottesville/hello-comics-downtown.md
 delete mode 100644 content/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.md
 delete mode 100644 content/cities/charlottesville/oakleys-gently-used-books.md
 delete mode 100644 content/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.md
 delete mode 100644 content/cities/chesapeake/advance-auto-parts-george-washington-highway-south.md
 create mode 100644 content/cities/chesapeake/advance-auto-parts-western-branch-boulevard.md
 create mode 100644 content/cities/chesapeake/dollar-tree-2.md
 create mode 100644 content/cities/chesapeake/firestone-chesapeake-square-ring-road.md
 delete mode 100644 content/cities/chesapeake/firestone-hillcrest-parkway.md
 delete mode 100644 content/cities/chesapeake/kramer-tire-battlefield-boulevard-north.md
 create mode 100644 content/cities/chesapeake/kramer-tire-western-branch-boulevard.md
 create mode 100644 content/cities/chesapeake/mattress-firm-carmichael-way.md
 delete mode 100644 content/cities/chesapeake/mattress-firm-crossways-boulevard.md
 delete mode 100644 content/cities/chesapeake/the-home-depot-hillcrest-parkway.md
 create mode 100644 content/cities/chesapeake/the-home-depot-old-taylor-road.md
 create mode 100644 content/cities/chesapeake/wawa-western-branch-boulevard.md
 create mode 100644 content/cities/clarksville/7-eleven-virginia-avenue.md
 rename content/cities/{mecklenburg-county => clarksville}/7-eleven.md (55%)
 create mode 100644 content/cities/clarksville/a2z-hobby.md
 delete mode 100644 content/cities/clarksville/aplus.md
 create mode 100644 content/cities/clarksville/art-and-books.md
 create mode 100644 content/cities/clarksville/buggs-island-baby-and-childrens-clothing.md
 create mode 100644 content/cities/clarksville/buggs-island-bait-and-tackle.md
 create mode 100644 content/cities/clarksville/clarksville-ace-hardware.md
 create mode 100644 content/cities/clarksville/clarksville-coin-laundry.md
 create mode 100644 content/cities/clarksville/clarksville-discount-outlet.md
 create mode 100644 content/cities/clarksville/clarksville-furniture-co.md
 create mode 100644 content/cities/clarksville/clarksville-hair-salon.md
 create mode 100644 content/cities/clarksville/clarksville-ruritan-club-thrift-shop.md
 rename content/cities/{suffolk/dollar-general-godwin-boulevard.md => clarksville/dollar-general.md} (52%)
 rename content/cities/{powhatan/food-lion-academy-road.md => clarksville/food-lion.md} (53%)
 create mode 100644 content/cities/clarksville/grandfathers-country-creations.md
 create mode 100644 content/cities/clarksville/lake-country-barber-shop.md
 create mode 100644 content/cities/clarksville/moores-chevrolet.md
 create mode 100644 content/cities/clarksville/sweet-violet.md
 create mode 100644 content/cities/clarksville/the-antique-market.md
 create mode 100644 content/cities/clarksville/the-corner-at-two-one-six.md
 create mode 100644 content/cities/clarksville/the-hound-and-quill-trading-company.md
 create mode 100644 content/cities/clarksville/verizon.md
 rename content/cities/{powhatan/virginia-abc-academy-road.md => clarksville/virginia-abc.md} (50%)
 create mode 100644 content/cities/clarksville/virginia-avenue-mall.md
 create mode 100644 content/cities/clarksville/watkins-cooper-lyon-funeral-home.md
 rename content/cities/{clarksville/ace-hardware.md => dublin/ace-hardware-cleburne-boulevard.md} (51%)
 rename content/cities/{smithfield/dollar-general-west-main-street.md => dublin/dollar-general.md} (50%)
 create mode 100644 content/cities/dublin/dollar-tree.md
 create mode 100644 content/cities/dublin/maria-bonita-tienda-mexicana.md
 create mode 100644 content/cities/dublin/oreilly-auto-parts.md
 create mode 100644 content/cities/dublin/shop-eez.md
 create mode 100644 content/cities/dublin/top-shelf-nail-service.md
 create mode 100644 content/cities/dublin/verizon.md
 create mode 100644 content/cities/dublin/virginia-abc.md
 create mode 100644 content/cities/falls-church/old-brick-house-square.md
 create mode 100644 content/cities/fredericksburg/firestone-patriot-highway.md
 delete mode 100644 content/cities/fredericksburg/firestone-plank-road.md
 delete mode 100644 content/cities/front-royal/speedway-north-shenandoah-avenue.md
 create mode 100644 content/cities/front-royal/speedway-south-commerce-avenue.md
 rename content/cities/hampton/{extra-space-storage-cunningham-drive.md => extra-space-storage-lasalle-avenue.md} (52%)
 delete mode 100644 content/cities/hampton/farm-fresh.md
 create mode 100644 content/cities/hampton/food-lion-east-mercury-boulevard.md
 create mode 100644 content/cities/harrisonburg/family-dollar-chicago-avenue.md
 delete mode 100644 content/cities/harrisonburg/family-dollar-south-main-street.md
 rename content/cities/henrico/{publix-john-rolfe-parkway.md => publix-pump-road.md} (50%)
 delete mode 100644 content/cities/james-city-county/7-eleven-merrimac-trail.md
 create mode 100644 content/cities/james-city-county/7-eleven-richmond-road.md
 delete mode 100644 content/cities/lexington/cocoa-mill-chocolate-company.md
 create mode 100644 content/cities/manassas/mattress-firm-liberia-avenue-2.md
 delete mode 100644 content/cities/manassas/mattress-firm-sowder-village-square.md
 delete mode 100644 content/cities/mecklenburg-county/_index.md
 create mode 100644 content/cities/midlothian/kroger-midlothian-turnpike.md
 delete mode 100644 content/cities/midlothian/kroger-rittenhouse-drive.md
 rename content/cities/{stafford/wawa-austin-park-drive.md => midlothian/wawa-pike-view-drive.md} (50%)
 delete mode 100644 content/cities/midlothian/wawa-southshore-pointe-drive.md
 delete mode 100644 content/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.md
 create mode 100644 content/cities/newport-news/tire-choice.md
 delete mode 100644 content/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.md
 create mode 100644 content/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.md
 delete mode 100644 content/cities/norfolk/rite-aid-east-little-creek-road.md
 create mode 100644 content/cities/norfolk/rite-aid-tidewater-drive.md
 delete mode 100644 content/cities/norfolk/wawa-east-little-creek-road.md
 create mode 100644 content/cities/norfolk/wawa-north-military-highway-2.md
 delete mode 100644 content/cities/north-chesterfield/kroger-hicks-road.md
 create mode 100644 content/cities/north-chesterfield/kroger-tim-price-way.md
 create mode 100644 content/cities/portsmouth/book-nook.md
 create mode 100644 content/cities/portsmouth/book-owl-bookstore.md
 create mode 100644 content/cities/portsmouth/harris-tire-service.md
 create mode 100644 content/cities/portsmouth/land-and-coates.md
 create mode 100644 content/cities/portsmouth/number-one-nails.md
 delete mode 100644 content/cities/portsmouth/rite-aid-airline-boulevard.md
 create mode 100644 content/cities/portsmouth/virginia-abc.md
 delete mode 100644 content/cities/portsmouth/warrant-realty-inc.md
 delete mode 100644 content/cities/portsmouth/wawa-frederick-boulevard.md
 create mode 100644 content/cities/portsmouth/wawa-victory-boulevard.md
 create mode 100644 content/cities/powhatan/food-lion-south-creek-one.md
 create mode 100644 content/cities/powhatan/virginia-abc-south-creek-one.md
 create mode 100644 content/cities/quinton/brooks-stitch-and-fold.md
 delete mode 100644 content/cities/quinton/hawthorne-laundry-and-dry-cleaners.md
 delete mode 100644 content/cities/quinton/margeauxs-florist.md
 create mode 100644 content/cities/quinton/new-kent-floral.md
 rename content/cities/richmond/{7-eleven-gayton-road.md => 7-eleven-north-arch-road.md} (51%)
 create mode 100644 content/cities/richmond/walgreens-brook-road.md
 delete mode 100644 content/cities/richmond/walgreens-hull-street-road.md
 delete mode 100644 content/cities/richmond/wawa-midlothian-turnpike-2.md
 create mode 100644 content/cities/richmond/wawa-west-broad-street.md
 delete mode 100644 content/cities/roanoke/petsmart-franklin-road-southwest.md
 create mode 100644 content/cities/roanoke/petsmart-valley-view-boulevard-northwest.md
 delete mode 100644 content/cities/sandston/7-eleven-east-williamsburg-road.md
 create mode 100644 content/cities/sandston/7-eleven-south-airport-drive.md
 create mode 100644 content/cities/smithfield/dollar-general-south-church-street.md
 create mode 100644 content/cities/south-boston/blue-ridge-tobacco-and-candle.md
 create mode 100644 content/cities/south-boston/cricket-wireless.md
 create mode 100644 content/cities/south-boston/food-lion.md
 create mode 100644 content/cities/south-boston/new-york-fashion.md
 create mode 100644 content/cities/south-boston/reaves-trophy-shop.md
 create mode 100644 content/cities/south-boston/riverdale-laundry-land-laundromat.md
 create mode 100644 content/cities/south-boston/smileys-general-merchandise.md
 create mode 100644 content/cities/south-boston/smokers-vape-plus.md
 create mode 100644 content/cities/south-boston/va-nails.md
 rename content/cities/{chesapeake/wawa-woodlake-drive.md => stafford/wawa-eustace-road.md} (50%)
 create mode 100644 content/cities/suffolk/dollar-general-wilroy-road.md
 delete mode 100644 content/cities/vienna/7-eleven-leesburg-pike-2.md
 create mode 100644 content/cities/vienna/7-eleven-park-street-southeast.md
 create mode 100644 content/cities/virginia-beach/food-lion-holland-road.md
 delete mode 100644 content/cities/virginia-beach/food-lion-north-great-neck-road.md
 create mode 100644 content/cities/virginia-beach/kroger-shore-drive.md
 delete mode 100644 content/cities/virginia-beach/kroger-virginia-beach-boulevard.md
 create mode 100644 content/cities/virginia-beach/rite-aid-south-rosemont-road.md
 delete mode 100644 content/cities/virginia-beach/rite-aid-upton-drive.md
 delete mode 100644 content/cities/virginia-beach/verizon-independence-boulevard.md
 create mode 100644 content/cities/virginia-beach/verizon-virginia-beach-boulevard.md
 create mode 100644 content/cities/woodbridge/joy-day-spa.md
 create mode 100644 content/cities/woodbridge/joy-nail-spa.md
 create mode 100644 content/cities/woodbridge/locksmith-outlet.md
 create mode 100644 content/cities/woodbridge/yegna-ethiopian-market.md
 delete mode 100644 content/cities/yorktown/7-eleven-george-washington-memorial-highway.md
 create mode 100644 data/cities/alexandria/georges-restaurant-equipment.yml
 create mode 100644 data/cities/alexandria/hair-cuttery-rose-hill-drive.yml
 delete mode 100644 data/cities/alexandria/hair-cuttery-south-van-dorn-street.yml
 create mode 100644 data/cities/baskerville/triangle-grocery.yml
 create mode 100644 data/cities/boydton/triangle-grocery.yml
 create mode 100644 data/cities/buffalo-junction/bowens-mini-mart-ii.yml
 create mode 100644 data/cities/charlottesville/blue-whale-books.yml
 create mode 100644 data/cities/charlottesville/heartwood-books.yml
 create mode 100644 data/cities/charlottesville/hello-comics-downtown.yml
 delete mode 100644 data/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.yml
 delete mode 100644 data/cities/charlottesville/oakleys-gently-used-books.yml
 delete mode 100644 data/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.yml
 delete mode 100644 data/cities/chesapeake/advance-auto-parts-george-washington-highway-south.yml
 create mode 100644 data/cities/chesapeake/advance-auto-parts-western-branch-boulevard.yml
 create mode 100644 data/cities/chesapeake/dollar-tree-2.yml
 create mode 100644 data/cities/chesapeake/firestone-chesapeake-square-ring-road.yml
 delete mode 100644 data/cities/chesapeake/firestone-hillcrest-parkway.yml
 delete mode 100644 data/cities/chesapeake/kramer-tire-battlefield-boulevard-north.yml
 create mode 100644 data/cities/chesapeake/kramer-tire-western-branch-boulevard.yml
 create mode 100644 data/cities/chesapeake/mattress-firm-carmichael-way.yml
 delete mode 100644 data/cities/chesapeake/mattress-firm-crossways-boulevard.yml
 delete mode 100644 data/cities/chesapeake/the-home-depot-hillcrest-parkway.yml
 create mode 100644 data/cities/chesapeake/the-home-depot-old-taylor-road.yml
 create mode 100644 data/cities/chesapeake/wawa-western-branch-boulevard.yml
 delete mode 100644 data/cities/chesapeake/wawa-woodlake-drive.yml
 rename data/cities/{mecklenburg-county/7-eleven.yml => clarksville/7-eleven-virginia-avenue.yml} (84%)
 rename data/cities/clarksville/{aplus.yml => 7-eleven.yml} (57%)
 create mode 100644 data/cities/clarksville/a2z-hobby.yml
 create mode 100644 data/cities/clarksville/art-and-books.yml
 create mode 100644 data/cities/clarksville/buggs-island-baby-and-childrens-clothing.yml
 create mode 100644 data/cities/clarksville/buggs-island-bait-and-tackle.yml
 rename data/cities/clarksville/{ace-hardware.yml => clarksville-ace-hardware.yml} (88%)
 create mode 100644 data/cities/clarksville/clarksville-coin-laundry.yml
 create mode 100644 data/cities/clarksville/clarksville-discount-outlet.yml
 create mode 100644 data/cities/clarksville/clarksville-furniture-co.yml
 create mode 100644 data/cities/clarksville/clarksville-hair-salon.yml
 create mode 100644 data/cities/clarksville/clarksville-ruritan-club-thrift-shop.yml
 create mode 100644 data/cities/clarksville/dollar-general.yml
 create mode 100644 data/cities/clarksville/food-lion.yml
 create mode 100644 data/cities/clarksville/grandfathers-country-creations.yml
 create mode 100644 data/cities/clarksville/lake-country-barber-shop.yml
 create mode 100644 data/cities/clarksville/moores-chevrolet.yml
 create mode 100644 data/cities/clarksville/sweet-violet.yml
 create mode 100644 data/cities/clarksville/the-antique-market.yml
 create mode 100644 data/cities/clarksville/the-corner-at-two-one-six.yml
 create mode 100644 data/cities/clarksville/the-hound-and-quill-trading-company.yml
 create mode 100644 data/cities/clarksville/verizon.yml
 create mode 100644 data/cities/clarksville/virginia-abc.yml
 create mode 100644 data/cities/clarksville/virginia-avenue-mall.yml
 create mode 100644 data/cities/clarksville/watkins-cooper-lyon-funeral-home.yml
 create mode 100644 data/cities/dublin/ace-hardware-cleburne-boulevard.yml
 create mode 100644 data/cities/dublin/dollar-general.yml
 create mode 100644 data/cities/dublin/dollar-tree.yml
 create mode 100644 data/cities/dublin/maria-bonita-tienda-mexicana.yml
 create mode 100644 data/cities/dublin/oreilly-auto-parts.yml
 create mode 100644 data/cities/dublin/shop-eez.yml
 create mode 100644 data/cities/dublin/top-shelf-nail-service.yml
 create mode 100644 data/cities/dublin/verizon.yml
 create mode 100644 data/cities/dublin/virginia-abc.yml
 create mode 100644 data/cities/falls-church/old-brick-house-square.yml
 create mode 100644 data/cities/fredericksburg/firestone-patriot-highway.yml
 delete mode 100644 data/cities/fredericksburg/firestone-plank-road.yml
 delete mode 100644 data/cities/front-royal/speedway-north-shenandoah-avenue.yml
 create mode 100644 data/cities/front-royal/speedway-south-commerce-avenue.yml
 delete mode 100644 data/cities/hampton/extra-space-storage-cunningham-drive.yml
 create mode 100644 data/cities/hampton/extra-space-storage-lasalle-avenue.yml
 rename data/cities/hampton/{farm-fresh.yml => food-lion-east-mercury-boulevard.yml} (73%)
 create mode 100644 data/cities/harrisonburg/family-dollar-chicago-avenue.yml
 delete mode 100644 data/cities/harrisonburg/family-dollar-south-main-street.yml
 delete mode 100644 data/cities/henrico/publix-john-rolfe-parkway.yml
 create mode 100644 data/cities/henrico/publix-pump-road.yml
 delete mode 100644 data/cities/james-city-county/7-eleven-merrimac-trail.yml
 create mode 100644 data/cities/james-city-county/7-eleven-richmond-road.yml
 delete mode 100644 data/cities/lexington/cocoa-mill-chocolate-company.yml
 create mode 100644 data/cities/manassas/mattress-firm-liberia-avenue-2.yml
 delete mode 100644 data/cities/manassas/mattress-firm-sowder-village-square.yml
 create mode 100644 data/cities/midlothian/kroger-midlothian-turnpike.yml
 delete mode 100644 data/cities/midlothian/kroger-rittenhouse-drive.yml
 create mode 100644 data/cities/midlothian/wawa-pike-view-drive.yml
 delete mode 100644 data/cities/midlothian/wawa-southshore-pointe-drive.yml
 delete mode 100644 data/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.yml
 create mode 100644 data/cities/newport-news/tire-choice.yml
 delete mode 100644 data/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.yml
 create mode 100644 data/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.yml
 delete mode 100644 data/cities/norfolk/rite-aid-east-little-creek-road.yml
 create mode 100644 data/cities/norfolk/rite-aid-tidewater-drive.yml
 delete mode 100644 data/cities/norfolk/wawa-east-little-creek-road.yml
 create mode 100644 data/cities/norfolk/wawa-north-military-highway-2.yml
 delete mode 100644 data/cities/north-chesterfield/kroger-hicks-road.yml
 create mode 100644 data/cities/north-chesterfield/kroger-tim-price-way.yml
 create mode 100644 data/cities/portsmouth/book-nook.yml
 create mode 100644 data/cities/portsmouth/book-owl-bookstore.yml
 create mode 100644 data/cities/portsmouth/harris-tire-service.yml
 create mode 100644 data/cities/portsmouth/land-and-coates.yml
 create mode 100644 data/cities/portsmouth/number-one-nails.yml
 delete mode 100644 data/cities/portsmouth/rite-aid-airline-boulevard.yml
 create mode 100644 data/cities/portsmouth/virginia-abc.yml
 delete mode 100644 data/cities/portsmouth/warrant-realty-inc.yml
 delete mode 100644 data/cities/portsmouth/wawa-frederick-boulevard.yml
 create mode 100644 data/cities/portsmouth/wawa-victory-boulevard.yml
 delete mode 100644 data/cities/powhatan/food-lion-academy-road.yml
 create mode 100644 data/cities/powhatan/food-lion-south-creek-one.yml
 delete mode 100644 data/cities/powhatan/virginia-abc-academy-road.yml
 create mode 100644 data/cities/powhatan/virginia-abc-south-creek-one.yml
 rename data/cities/quinton/{hawthorne-laundry-and-dry-cleaners.yml => brooks-stitch-and-fold.yml} (55%)
 rename data/cities/quinton/{margeauxs-florist.yml => new-kent-floral.yml} (51%)
 delete mode 100644 data/cities/richmond/7-eleven-gayton-road.yml
 create mode 100644 data/cities/richmond/7-eleven-north-arch-road.yml
 create mode 100644 data/cities/richmond/walgreens-brook-road.yml
 delete mode 100644 data/cities/richmond/walgreens-hull-street-road.yml
 delete mode 100644 data/cities/richmond/wawa-midlothian-turnpike-2.yml
 create mode 100644 data/cities/richmond/wawa-west-broad-street.yml
 delete mode 100644 data/cities/roanoke/petsmart-franklin-road-southwest.yml
 create mode 100644 data/cities/roanoke/petsmart-valley-view-boulevard-northwest.yml
 delete mode 100644 data/cities/sandston/7-eleven-east-williamsburg-road.yml
 create mode 100644 data/cities/sandston/7-eleven-south-airport-drive.yml
 create mode 100644 data/cities/smithfield/dollar-general-south-church-street.yml
 delete mode 100644 data/cities/smithfield/dollar-general-west-main-street.yml
 create mode 100644 data/cities/south-boston/blue-ridge-tobacco-and-candle.yml
 create mode 100644 data/cities/south-boston/cricket-wireless.yml
 create mode 100644 data/cities/south-boston/food-lion.yml
 create mode 100644 data/cities/south-boston/new-york-fashion.yml
 create mode 100644 data/cities/south-boston/reaves-trophy-shop.yml
 create mode 100644 data/cities/south-boston/riverdale-laundry-land-laundromat.yml
 create mode 100644 data/cities/south-boston/smileys-general-merchandise.yml
 create mode 100644 data/cities/south-boston/smokers-vape-plus.yml
 create mode 100644 data/cities/south-boston/va-nails.yml
 delete mode 100644 data/cities/stafford/wawa-austin-park-drive.yml
 create mode 100644 data/cities/stafford/wawa-eustace-road.yml
 delete mode 100644 data/cities/suffolk/dollar-general-godwin-boulevard.yml
 create mode 100644 data/cities/suffolk/dollar-general-wilroy-road.yml
 delete mode 100644 data/cities/vienna/7-eleven-leesburg-pike-2.yml
 create mode 100644 data/cities/vienna/7-eleven-park-street-southeast.yml
 create mode 100644 data/cities/virginia-beach/food-lion-holland-road.yml
 delete mode 100644 data/cities/virginia-beach/food-lion-north-great-neck-road.yml
 create mode 100644 data/cities/virginia-beach/kroger-shore-drive.yml
 delete mode 100644 data/cities/virginia-beach/kroger-virginia-beach-boulevard.yml
 create mode 100644 data/cities/virginia-beach/rite-aid-south-rosemont-road.yml
 delete mode 100644 data/cities/virginia-beach/rite-aid-upton-drive.yml
 delete mode 100644 data/cities/virginia-beach/verizon-independence-boulevard.yml
 create mode 100644 data/cities/virginia-beach/verizon-virginia-beach-boulevard.yml
 create mode 100644 data/cities/woodbridge/joy-day-spa.yml
 create mode 100644 data/cities/woodbridge/joy-nail-spa.yml
 create mode 100644 data/cities/woodbridge/locksmith-outlet.yml
 create mode 100644 data/cities/woodbridge/yegna-ethiopian-market.yml
 delete mode 100644 data/cities/yorktown/7-eleven-george-washington-memorial-highway.yml

diff --git a/content/cities/alexandria/georges-restaurant-equipment.md b/content/cities/alexandria/georges-restaurant-equipment.md
new file mode 100644
index 000000000..e5d4b7b8e
--- /dev/null
+++ b/content/cities/alexandria/georges-restaurant-equipment.md
@@ -0,0 +1,5 @@
+---
+title: "George’s Restaurant Equipment"
+url: /alexandria/georges-restaurant-equipment/
+shop: shop
+---
\ No newline at end of file
diff --git a/content/cities/alexandria/hair-cuttery-rose-hill-drive.md b/content/cities/alexandria/hair-cuttery-rose-hill-drive.md
new file mode 100644
index 000000000..6d609e0c6
--- /dev/null
+++ b/content/cities/alexandria/hair-cuttery-rose-hill-drive.md
@@ -0,0 +1,5 @@
+---
+title: "Hair Cuttery"
+url: /alexandria/hair-cuttery-rose-hill-drive/
+shop: hairdresser
+---
\ No newline at end of file
diff --git a/content/cities/alexandria/hair-cuttery-south-van-dorn-street.md b/content/cities/alexandria/hair-cuttery-south-van-dorn-street.md
deleted file mode 100644
index f41f68aaa..000000000
--- a/content/cities/alexandria/hair-cuttery-south-van-dorn-street.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Hair Cuttery"
-url: /alexandria/hair-cuttery-south-van-dorn-street/
-shop: hairdresser
----
\ No newline at end of file
diff --git a/content/cities/baskerville/_index.md b/content/cities/baskerville/_index.md
new file mode 100644
index 000000000..6609dad53
--- /dev/null
+++ b/content/cities/baskerville/_index.md
@@ -0,0 +1,6 @@
+---
+title: Baskerville
+url: /baskerville/
+latitude: 36.671
+longitude: -78.288
+---
\ No newline at end of file
diff --git a/content/cities/baskerville/triangle-grocery.md b/content/cities/baskerville/triangle-grocery.md
new file mode 100644
index 000000000..0cac1e6aa
--- /dev/null
+++ b/content/cities/baskerville/triangle-grocery.md
@@ -0,0 +1,5 @@
+---
+title: "Triangle Grocery"
+url: /baskerville/triangle-grocery/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/boydton/_index.md b/content/cities/boydton/_index.md
new file mode 100644
index 000000000..98e0bf84f
--- /dev/null
+++ b/content/cities/boydton/_index.md
@@ -0,0 +1,6 @@
+---
+title: Boydton
+url: /boydton/
+latitude: 36.662
+longitude: -78.407
+---
\ No newline at end of file
diff --git a/content/cities/boydton/triangle-grocery.md b/content/cities/boydton/triangle-grocery.md
new file mode 100644
index 000000000..ceed9a42f
--- /dev/null
+++ b/content/cities/boydton/triangle-grocery.md
@@ -0,0 +1,5 @@
+---
+title: "Triangle Grocery"
+url: /boydton/triangle-grocery/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/buffalo-junction/_index.md b/content/cities/buffalo-junction/_index.md
new file mode 100644
index 000000000..108778ef5
--- /dev/null
+++ b/content/cities/buffalo-junction/_index.md
@@ -0,0 +1,6 @@
+---
+title: Buffalo Junction
+url: /buffalo-junction/
+latitude: 36.649
+longitude: -78.676
+---
\ No newline at end of file
diff --git a/content/cities/buffalo-junction/bowens-mini-mart-ii.md b/content/cities/buffalo-junction/bowens-mini-mart-ii.md
new file mode 100644
index 000000000..03c4e3ca4
--- /dev/null
+++ b/content/cities/buffalo-junction/bowens-mini-mart-ii.md
@@ -0,0 +1,5 @@
+---
+title: "Bowen's Mini Mart II"
+url: /buffalo-junction/bowens-mini-mart-ii/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/charlottesville/blue-whale-books.md b/content/cities/charlottesville/blue-whale-books.md
new file mode 100644
index 000000000..5ffcc0e75
--- /dev/null
+++ b/content/cities/charlottesville/blue-whale-books.md
@@ -0,0 +1,5 @@
+---
+title: "Blue Whale Books"
+url: /charlottesville/blue-whale-books/
+shop: books
+---
\ No newline at end of file
diff --git a/content/cities/charlottesville/heartwood-books.md b/content/cities/charlottesville/heartwood-books.md
new file mode 100644
index 000000000..2453dc63b
--- /dev/null
+++ b/content/cities/charlottesville/heartwood-books.md
@@ -0,0 +1,5 @@
+---
+title: "Heartwood Books"
+url: /charlottesville/heartwood-books/
+shop: books
+---
\ No newline at end of file
diff --git a/content/cities/charlottesville/hello-comics-downtown.md b/content/cities/charlottesville/hello-comics-downtown.md
new file mode 100644
index 000000000..a387f1126
--- /dev/null
+++ b/content/cities/charlottesville/hello-comics-downtown.md
@@ -0,0 +1,5 @@
+---
+title: "Hello Comics Downtown"
+url: /charlottesville/hello-comics-downtown/
+shop: books
+---
\ No newline at end of file
diff --git a/content/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.md b/content/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.md
deleted file mode 100644
index e5b5fb798..000000000
--- a/content/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Ike’s Underground Vintage Clothing And Strange Cargo"
-url: /charlottesville/ikes-underground-vintage-clothing-and-strange-cargo/
-shop: clothes
----
\ No newline at end of file
diff --git a/content/cities/charlottesville/oakleys-gently-used-books.md b/content/cities/charlottesville/oakleys-gently-used-books.md
deleted file mode 100644
index bf537f68d..000000000
--- a/content/cities/charlottesville/oakleys-gently-used-books.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Oakley’s Gently Used Books"
-url: /charlottesville/oakleys-gently-used-books/
-shop: books
----
\ No newline at end of file
diff --git a/content/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.md b/content/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.md
deleted file mode 100644
index 914d8d7ac..000000000
--- a/content/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Telegraph Art & Comics"
-url: /charlottesville/telegraph-art-and-comics-4th-street-northeast/
-shop: books
----
\ No newline at end of file
diff --git a/content/cities/chesapeake/advance-auto-parts-george-washington-highway-south.md b/content/cities/chesapeake/advance-auto-parts-george-washington-highway-south.md
deleted file mode 100644
index 279fa58fe..000000000
--- a/content/cities/chesapeake/advance-auto-parts-george-washington-highway-south.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Advance Auto Parts"
-url: /chesapeake/advance-auto-parts-george-washington-highway-south/
-shop: car parts
----
\ No newline at end of file
diff --git a/content/cities/chesapeake/advance-auto-parts-western-branch-boulevard.md b/content/cities/chesapeake/advance-auto-parts-western-branch-boulevard.md
new file mode 100644
index 000000000..c513359dc
--- /dev/null
+++ b/content/cities/chesapeake/advance-auto-parts-western-branch-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Advance Auto Parts"
+url: /chesapeake/advance-auto-parts-western-branch-boulevard/
+shop: car parts
+---
\ No newline at end of file
diff --git a/content/cities/chesapeake/dollar-tree-2.md b/content/cities/chesapeake/dollar-tree-2.md
new file mode 100644
index 000000000..2cfadb921
--- /dev/null
+++ b/content/cities/chesapeake/dollar-tree-2.md
@@ -0,0 +1,5 @@
+---
+title: "Dollar Tree"
+url: /chesapeake/dollar-tree-2/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/chesapeake/firestone-chesapeake-square-ring-road.md b/content/cities/chesapeake/firestone-chesapeake-square-ring-road.md
new file mode 100644
index 000000000..ae1f3f041
--- /dev/null
+++ b/content/cities/chesapeake/firestone-chesapeake-square-ring-road.md
@@ -0,0 +1,5 @@
+---
+title: "Firestone"
+url: /chesapeake/firestone-chesapeake-square-ring-road/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/chesapeake/firestone-hillcrest-parkway.md b/content/cities/chesapeake/firestone-hillcrest-parkway.md
deleted file mode 100644
index 54fac7617..000000000
--- a/content/cities/chesapeake/firestone-hillcrest-parkway.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Firestone"
-url: /chesapeake/firestone-hillcrest-parkway/
-shop: car repair
----
\ No newline at end of file
diff --git a/content/cities/chesapeake/kramer-tire-battlefield-boulevard-north.md b/content/cities/chesapeake/kramer-tire-battlefield-boulevard-north.md
deleted file mode 100644
index e818b5f03..000000000
--- a/content/cities/chesapeake/kramer-tire-battlefield-boulevard-north.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Kramer Tire"
-url: /chesapeake/kramer-tire-battlefield-boulevard-north/
-shop: tyres
----
\ No newline at end of file
diff --git a/content/cities/chesapeake/kramer-tire-western-branch-boulevard.md b/content/cities/chesapeake/kramer-tire-western-branch-boulevard.md
new file mode 100644
index 000000000..69b620193
--- /dev/null
+++ b/content/cities/chesapeake/kramer-tire-western-branch-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Kramer Tire"
+url: /chesapeake/kramer-tire-western-branch-boulevard/
+shop: tyres
+---
\ No newline at end of file
diff --git a/content/cities/chesapeake/mattress-firm-carmichael-way.md b/content/cities/chesapeake/mattress-firm-carmichael-way.md
new file mode 100644
index 000000000..ea9d2bdba
--- /dev/null
+++ b/content/cities/chesapeake/mattress-firm-carmichael-way.md
@@ -0,0 +1,5 @@
+---
+title: "Mattress Firm"
+url: /chesapeake/mattress-firm-carmichael-way/
+shop: bed
+---
\ No newline at end of file
diff --git a/content/cities/chesapeake/mattress-firm-crossways-boulevard.md b/content/cities/chesapeake/mattress-firm-crossways-boulevard.md
deleted file mode 100644
index 0503e0ee5..000000000
--- a/content/cities/chesapeake/mattress-firm-crossways-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Mattress Firm"
-url: /chesapeake/mattress-firm-crossways-boulevard/
-shop: bed
----
\ No newline at end of file
diff --git a/content/cities/chesapeake/the-home-depot-hillcrest-parkway.md b/content/cities/chesapeake/the-home-depot-hillcrest-parkway.md
deleted file mode 100644
index 8a54922c0..000000000
--- a/content/cities/chesapeake/the-home-depot-hillcrest-parkway.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "The Home Depot"
-url: /chesapeake/the-home-depot-hillcrest-parkway/
-shop: doityourself
----
\ No newline at end of file
diff --git a/content/cities/chesapeake/the-home-depot-old-taylor-road.md b/content/cities/chesapeake/the-home-depot-old-taylor-road.md
new file mode 100644
index 000000000..1bc849057
--- /dev/null
+++ b/content/cities/chesapeake/the-home-depot-old-taylor-road.md
@@ -0,0 +1,5 @@
+---
+title: "The Home Depot"
+url: /chesapeake/the-home-depot-old-taylor-road/
+shop: doityourself
+---
\ No newline at end of file
diff --git a/content/cities/chesapeake/wawa-western-branch-boulevard.md b/content/cities/chesapeake/wawa-western-branch-boulevard.md
new file mode 100644
index 000000000..3a6b6102c
--- /dev/null
+++ b/content/cities/chesapeake/wawa-western-branch-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Wawa"
+url: /chesapeake/wawa-western-branch-boulevard/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/7-eleven-virginia-avenue.md b/content/cities/clarksville/7-eleven-virginia-avenue.md
new file mode 100644
index 000000000..a8f32b771
--- /dev/null
+++ b/content/cities/clarksville/7-eleven-virginia-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "7-Eleven"
+url: /clarksville/7-eleven-virginia-avenue/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/mecklenburg-county/7-eleven.md b/content/cities/clarksville/7-eleven.md
similarity index 55%
rename from content/cities/mecklenburg-county/7-eleven.md
rename to content/cities/clarksville/7-eleven.md
index 05f98ade9..48510eaf8 100644
--- a/content/cities/mecklenburg-county/7-eleven.md
+++ b/content/cities/clarksville/7-eleven.md
@@ -1,5 +1,5 @@
 ---
 title: "7-Eleven"
-url: /mecklenburg-county/7-eleven/
+url: /clarksville/7-eleven/
 shop: convenience
 ---
\ No newline at end of file
diff --git a/content/cities/clarksville/_index.md b/content/cities/clarksville/_index.md
index 597e99d7b..956d179ea 100644
--- a/content/cities/clarksville/_index.md
+++ b/content/cities/clarksville/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Clarksville
 url: /clarksville/
-latitude: 36.622
-longitude: -78.566
+latitude: 36.625
+longitude: -78.556
 ---
\ No newline at end of file
diff --git a/content/cities/clarksville/a2z-hobby.md b/content/cities/clarksville/a2z-hobby.md
new file mode 100644
index 000000000..e9f5745e8
--- /dev/null
+++ b/content/cities/clarksville/a2z-hobby.md
@@ -0,0 +1,5 @@
+---
+title: "A2Z Hobby"
+url: /clarksville/a2z-hobby/
+shop: model
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/aplus.md b/content/cities/clarksville/aplus.md
deleted file mode 100644
index 614b0ad69..000000000
--- a/content/cities/clarksville/aplus.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "APlus"
-url: /clarksville/aplus/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/clarksville/art-and-books.md b/content/cities/clarksville/art-and-books.md
new file mode 100644
index 000000000..21a56e612
--- /dev/null
+++ b/content/cities/clarksville/art-and-books.md
@@ -0,0 +1,5 @@
+---
+title: "Art & Books"
+url: /clarksville/art-and-books/
+shop: books
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/buggs-island-baby-and-childrens-clothing.md b/content/cities/clarksville/buggs-island-baby-and-childrens-clothing.md
new file mode 100644
index 000000000..a0673b41a
--- /dev/null
+++ b/content/cities/clarksville/buggs-island-baby-and-childrens-clothing.md
@@ -0,0 +1,5 @@
+---
+title: "Buggs Island Baby & Children's Clothing"
+url: /clarksville/buggs-island-baby-and-childrens-clothing/
+shop: clothes
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/buggs-island-bait-and-tackle.md b/content/cities/clarksville/buggs-island-bait-and-tackle.md
new file mode 100644
index 000000000..ce5435283
--- /dev/null
+++ b/content/cities/clarksville/buggs-island-bait-and-tackle.md
@@ -0,0 +1,5 @@
+---
+title: "Buggs Island Bait & Tackle"
+url: /clarksville/buggs-island-bait-and-tackle/
+shop: fishing
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/clarksville-ace-hardware.md b/content/cities/clarksville/clarksville-ace-hardware.md
new file mode 100644
index 000000000..b8b168805
--- /dev/null
+++ b/content/cities/clarksville/clarksville-ace-hardware.md
@@ -0,0 +1,5 @@
+---
+title: "Clarksville Ace Hardware"
+url: /clarksville/clarksville-ace-hardware/
+shop: doityourself
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/clarksville-coin-laundry.md b/content/cities/clarksville/clarksville-coin-laundry.md
new file mode 100644
index 000000000..fcc71e87f
--- /dev/null
+++ b/content/cities/clarksville/clarksville-coin-laundry.md
@@ -0,0 +1,5 @@
+---
+title: "Clarksville Coin Laundry"
+url: /clarksville/clarksville-coin-laundry/
+shop: laundry
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/clarksville-discount-outlet.md b/content/cities/clarksville/clarksville-discount-outlet.md
new file mode 100644
index 000000000..5d30a1823
--- /dev/null
+++ b/content/cities/clarksville/clarksville-discount-outlet.md
@@ -0,0 +1,5 @@
+---
+title: "Clarksville Discount Outlet"
+url: /clarksville/clarksville-discount-outlet/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/clarksville-furniture-co.md b/content/cities/clarksville/clarksville-furniture-co.md
new file mode 100644
index 000000000..c153a3aa1
--- /dev/null
+++ b/content/cities/clarksville/clarksville-furniture-co.md
@@ -0,0 +1,5 @@
+---
+title: "Clarksville Furniture Co"
+url: /clarksville/clarksville-furniture-co/
+shop: furniture
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/clarksville-hair-salon.md b/content/cities/clarksville/clarksville-hair-salon.md
new file mode 100644
index 000000000..185bd0f21
--- /dev/null
+++ b/content/cities/clarksville/clarksville-hair-salon.md
@@ -0,0 +1,5 @@
+---
+title: "Clarksville Hair Salon"
+url: /clarksville/clarksville-hair-salon/
+shop: hairdresser
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/clarksville-ruritan-club-thrift-shop.md b/content/cities/clarksville/clarksville-ruritan-club-thrift-shop.md
new file mode 100644
index 000000000..4d87db8ac
--- /dev/null
+++ b/content/cities/clarksville/clarksville-ruritan-club-thrift-shop.md
@@ -0,0 +1,5 @@
+---
+title: "Clarksville Ruritan Club Thrift Shop"
+url: /clarksville/clarksville-ruritan-club-thrift-shop/
+shop: charity
+---
\ No newline at end of file
diff --git a/content/cities/suffolk/dollar-general-godwin-boulevard.md b/content/cities/clarksville/dollar-general.md
similarity index 52%
rename from content/cities/suffolk/dollar-general-godwin-boulevard.md
rename to content/cities/clarksville/dollar-general.md
index 42ebaddac..90b7b9ba8 100644
--- a/content/cities/suffolk/dollar-general-godwin-boulevard.md
+++ b/content/cities/clarksville/dollar-general.md
@@ -1,5 +1,5 @@
 ---
 title: "Dollar General"
-url: /suffolk/dollar-general-godwin-boulevard/
+url: /clarksville/dollar-general/
 shop: variety store
 ---
\ No newline at end of file
diff --git a/content/cities/powhatan/food-lion-academy-road.md b/content/cities/clarksville/food-lion.md
similarity index 53%
rename from content/cities/powhatan/food-lion-academy-road.md
rename to content/cities/clarksville/food-lion.md
index e9f60fc74..7c9e57461 100644
--- a/content/cities/powhatan/food-lion-academy-road.md
+++ b/content/cities/clarksville/food-lion.md
@@ -1,5 +1,5 @@
 ---
 title: "Food Lion"
-url: /powhatan/food-lion-academy-road/
+url: /clarksville/food-lion/
 shop: supermarket
 ---
\ No newline at end of file
diff --git a/content/cities/clarksville/grandfathers-country-creations.md b/content/cities/clarksville/grandfathers-country-creations.md
new file mode 100644
index 000000000..457137afe
--- /dev/null
+++ b/content/cities/clarksville/grandfathers-country-creations.md
@@ -0,0 +1,5 @@
+---
+title: "Grandfather's Country Creations"
+url: /clarksville/grandfathers-country-creations/
+shop: gift
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/lake-country-barber-shop.md b/content/cities/clarksville/lake-country-barber-shop.md
new file mode 100644
index 000000000..60d25316e
--- /dev/null
+++ b/content/cities/clarksville/lake-country-barber-shop.md
@@ -0,0 +1,5 @@
+---
+title: "Lake Country Barber Shop"
+url: /clarksville/lake-country-barber-shop/
+shop: hairdresser
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/moores-chevrolet.md b/content/cities/clarksville/moores-chevrolet.md
new file mode 100644
index 000000000..ec7189bb1
--- /dev/null
+++ b/content/cities/clarksville/moores-chevrolet.md
@@ -0,0 +1,5 @@
+---
+title: "Moore's Chevrolet"
+url: /clarksville/moores-chevrolet/
+shop: car
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/sweet-violet.md b/content/cities/clarksville/sweet-violet.md
new file mode 100644
index 000000000..284758e2d
--- /dev/null
+++ b/content/cities/clarksville/sweet-violet.md
@@ -0,0 +1,5 @@
+---
+title: "Sweet Violet"
+url: /clarksville/sweet-violet/
+shop: gift
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/the-antique-market.md b/content/cities/clarksville/the-antique-market.md
new file mode 100644
index 000000000..6ded98919
--- /dev/null
+++ b/content/cities/clarksville/the-antique-market.md
@@ -0,0 +1,5 @@
+---
+title: "The Antique Market"
+url: /clarksville/the-antique-market/
+shop: antiques
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/the-corner-at-two-one-six.md b/content/cities/clarksville/the-corner-at-two-one-six.md
new file mode 100644
index 000000000..107d609bb
--- /dev/null
+++ b/content/cities/clarksville/the-corner-at-two-one-six.md
@@ -0,0 +1,5 @@
+---
+title: "The Corner at Two One Six"
+url: /clarksville/the-corner-at-two-one-six/
+shop: gift
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/the-hound-and-quill-trading-company.md b/content/cities/clarksville/the-hound-and-quill-trading-company.md
new file mode 100644
index 000000000..0748eaa9a
--- /dev/null
+++ b/content/cities/clarksville/the-hound-and-quill-trading-company.md
@@ -0,0 +1,5 @@
+---
+title: "The Hound & Quill Trading Company"
+url: /clarksville/the-hound-and-quill-trading-company/
+shop: books
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/verizon.md b/content/cities/clarksville/verizon.md
new file mode 100644
index 000000000..ed7d1c1be
--- /dev/null
+++ b/content/cities/clarksville/verizon.md
@@ -0,0 +1,5 @@
+---
+title: "Verizon"
+url: /clarksville/verizon/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/powhatan/virginia-abc-academy-road.md b/content/cities/clarksville/virginia-abc.md
similarity index 50%
rename from content/cities/powhatan/virginia-abc-academy-road.md
rename to content/cities/clarksville/virginia-abc.md
index 6fd5d4a27..d1a96f1d9 100644
--- a/content/cities/powhatan/virginia-abc-academy-road.md
+++ b/content/cities/clarksville/virginia-abc.md
@@ -1,5 +1,5 @@
 ---
 title: "Virginia ABC"
-url: /powhatan/virginia-abc-academy-road/
+url: /clarksville/virginia-abc/
 shop: alcohol
 ---
\ No newline at end of file
diff --git a/content/cities/clarksville/virginia-avenue-mall.md b/content/cities/clarksville/virginia-avenue-mall.md
new file mode 100644
index 000000000..1a628cbe6
--- /dev/null
+++ b/content/cities/clarksville/virginia-avenue-mall.md
@@ -0,0 +1,5 @@
+---
+title: "Virginia Avenue Mall"
+url: /clarksville/virginia-avenue-mall/
+shop: charity
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/watkins-cooper-lyon-funeral-home.md b/content/cities/clarksville/watkins-cooper-lyon-funeral-home.md
new file mode 100644
index 000000000..08a413438
--- /dev/null
+++ b/content/cities/clarksville/watkins-cooper-lyon-funeral-home.md
@@ -0,0 +1,5 @@
+---
+title: "Watkins Cooper Lyon Funeral Home"
+url: /clarksville/watkins-cooper-lyon-funeral-home/
+shop: funeral directors
+---
\ No newline at end of file
diff --git a/content/cities/clarksville/ace-hardware.md b/content/cities/dublin/ace-hardware-cleburne-boulevard.md
similarity index 51%
rename from content/cities/clarksville/ace-hardware.md
rename to content/cities/dublin/ace-hardware-cleburne-boulevard.md
index 7555068c5..6119add3f 100644
--- a/content/cities/clarksville/ace-hardware.md
+++ b/content/cities/dublin/ace-hardware-cleburne-boulevard.md
@@ -1,5 +1,5 @@
 ---
 title: "Ace Hardware"
-url: /clarksville/ace-hardware/
+url: /dublin/ace-hardware-cleburne-boulevard/
 shop: doityourself
 ---
\ No newline at end of file
diff --git a/content/cities/smithfield/dollar-general-west-main-street.md b/content/cities/dublin/dollar-general.md
similarity index 50%
rename from content/cities/smithfield/dollar-general-west-main-street.md
rename to content/cities/dublin/dollar-general.md
index 7d9557160..8a43c6013 100644
--- a/content/cities/smithfield/dollar-general-west-main-street.md
+++ b/content/cities/dublin/dollar-general.md
@@ -1,5 +1,5 @@
 ---
 title: "Dollar General"
-url: /smithfield/dollar-general-west-main-street/
+url: /dublin/dollar-general/
 shop: variety store
 ---
\ No newline at end of file
diff --git a/content/cities/dublin/dollar-tree.md b/content/cities/dublin/dollar-tree.md
new file mode 100644
index 000000000..6333cb370
--- /dev/null
+++ b/content/cities/dublin/dollar-tree.md
@@ -0,0 +1,5 @@
+---
+title: "Dollar Tree"
+url: /dublin/dollar-tree/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/dublin/maria-bonita-tienda-mexicana.md b/content/cities/dublin/maria-bonita-tienda-mexicana.md
new file mode 100644
index 000000000..1afc6957c
--- /dev/null
+++ b/content/cities/dublin/maria-bonita-tienda-mexicana.md
@@ -0,0 +1,5 @@
+---
+title: "Maria Bonita Tienda Mexicana"
+url: /dublin/maria-bonita-tienda-mexicana/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/dublin/oreilly-auto-parts.md b/content/cities/dublin/oreilly-auto-parts.md
new file mode 100644
index 000000000..0a81c6884
--- /dev/null
+++ b/content/cities/dublin/oreilly-auto-parts.md
@@ -0,0 +1,5 @@
+---
+title: "O'Reilly Auto Parts"
+url: /dublin/oreilly-auto-parts/
+shop: car parts
+---
\ No newline at end of file
diff --git a/content/cities/dublin/shop-eez.md b/content/cities/dublin/shop-eez.md
new file mode 100644
index 000000000..22a80d96d
--- /dev/null
+++ b/content/cities/dublin/shop-eez.md
@@ -0,0 +1,5 @@
+---
+title: "Shop-Eez"
+url: /dublin/shop-eez/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/dublin/top-shelf-nail-service.md b/content/cities/dublin/top-shelf-nail-service.md
new file mode 100644
index 000000000..1cc03b2fe
--- /dev/null
+++ b/content/cities/dublin/top-shelf-nail-service.md
@@ -0,0 +1,5 @@
+---
+title: "Top Shelf Nail Service"
+url: /dublin/top-shelf-nail-service/
+shop: beauty
+---
\ No newline at end of file
diff --git a/content/cities/dublin/verizon.md b/content/cities/dublin/verizon.md
new file mode 100644
index 000000000..a606c27f3
--- /dev/null
+++ b/content/cities/dublin/verizon.md
@@ -0,0 +1,5 @@
+---
+title: "Verizon"
+url: /dublin/verizon/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/dublin/virginia-abc.md b/content/cities/dublin/virginia-abc.md
new file mode 100644
index 000000000..84d8a04eb
--- /dev/null
+++ b/content/cities/dublin/virginia-abc.md
@@ -0,0 +1,5 @@
+---
+title: "Virginia ABC"
+url: /dublin/virginia-abc/
+shop: alcohol
+---
\ No newline at end of file
diff --git a/content/cities/fairfield/_index.md b/content/cities/fairfield/_index.md
index de08a83c2..d9224128d 100644
--- a/content/cities/fairfield/_index.md
+++ b/content/cities/fairfield/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Fairfield
 url: /fairfield/
-latitude: 37.888
-longitude: -79.288
+latitude: 37.882
+longitude: -79.282
 ---
\ No newline at end of file
diff --git a/content/cities/falls-church/old-brick-house-square.md b/content/cities/falls-church/old-brick-house-square.md
new file mode 100644
index 000000000..3e116baed
--- /dev/null
+++ b/content/cities/falls-church/old-brick-house-square.md
@@ -0,0 +1,5 @@
+---
+title: "Old Brick House Square"
+url: /falls-church/old-brick-house-square/
+shop: wine
+---
\ No newline at end of file
diff --git a/content/cities/fredericksburg/firestone-patriot-highway.md b/content/cities/fredericksburg/firestone-patriot-highway.md
new file mode 100644
index 000000000..1319f4a2e
--- /dev/null
+++ b/content/cities/fredericksburg/firestone-patriot-highway.md
@@ -0,0 +1,5 @@
+---
+title: "Firestone"
+url: /fredericksburg/firestone-patriot-highway/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/fredericksburg/firestone-plank-road.md b/content/cities/fredericksburg/firestone-plank-road.md
deleted file mode 100644
index ff2d01176..000000000
--- a/content/cities/fredericksburg/firestone-plank-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Firestone"
-url: /fredericksburg/firestone-plank-road/
-shop: car repair
----
\ No newline at end of file
diff --git a/content/cities/front-royal/speedway-north-shenandoah-avenue.md b/content/cities/front-royal/speedway-north-shenandoah-avenue.md
deleted file mode 100644
index c27344860..000000000
--- a/content/cities/front-royal/speedway-north-shenandoah-avenue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Speedway"
-url: /front-royal/speedway-north-shenandoah-avenue/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/front-royal/speedway-south-commerce-avenue.md b/content/cities/front-royal/speedway-south-commerce-avenue.md
new file mode 100644
index 000000000..78ba27fa7
--- /dev/null
+++ b/content/cities/front-royal/speedway-south-commerce-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "Speedway"
+url: /front-royal/speedway-south-commerce-avenue/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/great-falls/_index.md b/content/cities/great-falls/_index.md
index cd3221bf0..f2bdf0693 100644
--- a/content/cities/great-falls/_index.md
+++ b/content/cities/great-falls/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Great Falls
 url: /great-falls/
-latitude: 38.998
-longitude: -77.29
+latitude: 38.997
+longitude: -77.287
 ---
\ No newline at end of file
diff --git a/content/cities/hampton/extra-space-storage-cunningham-drive.md b/content/cities/hampton/extra-space-storage-lasalle-avenue.md
similarity index 52%
rename from content/cities/hampton/extra-space-storage-cunningham-drive.md
rename to content/cities/hampton/extra-space-storage-lasalle-avenue.md
index aa94954d7..af2b01a4e 100644
--- a/content/cities/hampton/extra-space-storage-cunningham-drive.md
+++ b/content/cities/hampton/extra-space-storage-lasalle-avenue.md
@@ -1,5 +1,5 @@
 ---
 title: "Extra Space Storage"
-url: /hampton/extra-space-storage-cunningham-drive/
+url: /hampton/extra-space-storage-lasalle-avenue/
 shop: storage rental
 ---
\ No newline at end of file
diff --git a/content/cities/hampton/farm-fresh.md b/content/cities/hampton/farm-fresh.md
deleted file mode 100644
index 6722eb1d8..000000000
--- a/content/cities/hampton/farm-fresh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Farm Fresh"
-url: /hampton/farm-fresh/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/hampton/food-lion-east-mercury-boulevard.md b/content/cities/hampton/food-lion-east-mercury-boulevard.md
new file mode 100644
index 000000000..2f445e6c1
--- /dev/null
+++ b/content/cities/hampton/food-lion-east-mercury-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Food Lion"
+url: /hampton/food-lion-east-mercury-boulevard/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/harrisonburg/family-dollar-chicago-avenue.md b/content/cities/harrisonburg/family-dollar-chicago-avenue.md
new file mode 100644
index 000000000..bd97f1c33
--- /dev/null
+++ b/content/cities/harrisonburg/family-dollar-chicago-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "Family Dollar"
+url: /harrisonburg/family-dollar-chicago-avenue/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/harrisonburg/family-dollar-south-main-street.md b/content/cities/harrisonburg/family-dollar-south-main-street.md
deleted file mode 100644
index 66504a5ed..000000000
--- a/content/cities/harrisonburg/family-dollar-south-main-street.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Family Dollar"
-url: /harrisonburg/family-dollar-south-main-street/
-shop: variety store
----
\ No newline at end of file
diff --git a/content/cities/henrico/publix-john-rolfe-parkway.md b/content/cities/henrico/publix-pump-road.md
similarity index 50%
rename from content/cities/henrico/publix-john-rolfe-parkway.md
rename to content/cities/henrico/publix-pump-road.md
index ecfa6f7c6..428762c47 100644
--- a/content/cities/henrico/publix-john-rolfe-parkway.md
+++ b/content/cities/henrico/publix-pump-road.md
@@ -1,5 +1,5 @@
 ---
 title: "Publix"
-url: /henrico/publix-john-rolfe-parkway/
+url: /henrico/publix-pump-road/
 shop: supermarket
 ---
\ No newline at end of file
diff --git a/content/cities/james-city-county/7-eleven-merrimac-trail.md b/content/cities/james-city-county/7-eleven-merrimac-trail.md
deleted file mode 100644
index 68c0e0c9a..000000000
--- a/content/cities/james-city-county/7-eleven-merrimac-trail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "7-Eleven"
-url: /james-city-county/7-eleven-merrimac-trail/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/james-city-county/7-eleven-richmond-road.md b/content/cities/james-city-county/7-eleven-richmond-road.md
new file mode 100644
index 000000000..d5d451da0
--- /dev/null
+++ b/content/cities/james-city-county/7-eleven-richmond-road.md
@@ -0,0 +1,5 @@
+---
+title: "7-Eleven"
+url: /james-city-county/7-eleven-richmond-road/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/james-city-county/_index.md b/content/cities/james-city-county/_index.md
index 5a65e3a29..2451b1b1b 100644
--- a/content/cities/james-city-county/_index.md
+++ b/content/cities/james-city-county/_index.md
@@ -1,6 +1,6 @@
 ---
 title: James City County
 url: /james-city-county/
-latitude: 37.346
-longitude: -76.758
+latitude: 37.265
+longitude: -76.674
 ---
\ No newline at end of file
diff --git a/content/cities/lexington/cocoa-mill-chocolate-company.md b/content/cities/lexington/cocoa-mill-chocolate-company.md
deleted file mode 100644
index 13c807d72..000000000
--- a/content/cities/lexington/cocoa-mill-chocolate-company.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Cocoa Mill Chocolate Company"
-url: /lexington/cocoa-mill-chocolate-company/
-shop: confectionery
----
\ No newline at end of file
diff --git a/content/cities/lively/_index.md b/content/cities/lively/_index.md
index 8b3a5ddf3..a7c8aed60 100644
--- a/content/cities/lively/_index.md
+++ b/content/cities/lively/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lively
 url: /lively/
-latitude: 37.777
-longitude: -76.514
+latitude: 37.779
+longitude: -76.515
 ---
\ No newline at end of file
diff --git a/content/cities/manassas/mattress-firm-liberia-avenue-2.md b/content/cities/manassas/mattress-firm-liberia-avenue-2.md
new file mode 100644
index 000000000..6830789da
--- /dev/null
+++ b/content/cities/manassas/mattress-firm-liberia-avenue-2.md
@@ -0,0 +1,5 @@
+---
+title: "Mattress Firm"
+url: /manassas/mattress-firm-liberia-avenue-2/
+shop: bed
+---
\ No newline at end of file
diff --git a/content/cities/manassas/mattress-firm-sowder-village-square.md b/content/cities/manassas/mattress-firm-sowder-village-square.md
deleted file mode 100644
index e1d731abe..000000000
--- a/content/cities/manassas/mattress-firm-sowder-village-square.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Mattress Firm"
-url: /manassas/mattress-firm-sowder-village-square/
-shop: bed
----
\ No newline at end of file
diff --git a/content/cities/mecklenburg-county/_index.md b/content/cities/mecklenburg-county/_index.md
deleted file mode 100644
index e8385f454..000000000
--- a/content/cities/mecklenburg-county/_index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Mecklenburg County
-url: /mecklenburg-county/
-latitude: 36.625
-longitude: -78.557
----
\ No newline at end of file
diff --git a/content/cities/midlothian/kroger-midlothian-turnpike.md b/content/cities/midlothian/kroger-midlothian-turnpike.md
new file mode 100644
index 000000000..93262ae5b
--- /dev/null
+++ b/content/cities/midlothian/kroger-midlothian-turnpike.md
@@ -0,0 +1,5 @@
+---
+title: "Kroger"
+url: /midlothian/kroger-midlothian-turnpike/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/midlothian/kroger-rittenhouse-drive.md b/content/cities/midlothian/kroger-rittenhouse-drive.md
deleted file mode 100644
index d4cf19e49..000000000
--- a/content/cities/midlothian/kroger-rittenhouse-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Kroger"
-url: /midlothian/kroger-rittenhouse-drive/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/stafford/wawa-austin-park-drive.md b/content/cities/midlothian/wawa-pike-view-drive.md
similarity index 50%
rename from content/cities/stafford/wawa-austin-park-drive.md
rename to content/cities/midlothian/wawa-pike-view-drive.md
index db5e4c9b7..7ee408e7b 100644
--- a/content/cities/stafford/wawa-austin-park-drive.md
+++ b/content/cities/midlothian/wawa-pike-view-drive.md
@@ -1,5 +1,5 @@
 ---
 title: "Wawa"
-url: /stafford/wawa-austin-park-drive/
+url: /midlothian/wawa-pike-view-drive/
 shop: convenience
 ---
\ No newline at end of file
diff --git a/content/cities/midlothian/wawa-southshore-pointe-drive.md b/content/cities/midlothian/wawa-southshore-pointe-drive.md
deleted file mode 100644
index d5f49a6fb..000000000
--- a/content/cities/midlothian/wawa-southshore-pointe-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Wawa"
-url: /midlothian/wawa-southshore-pointe-drive/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/nathalie/_index.md b/content/cities/nathalie/_index.md
index 973bff011..9b0b65ca2 100644
--- a/content/cities/nathalie/_index.md
+++ b/content/cities/nathalie/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Nathalie
 url: /nathalie/
-latitude: 36.978
-longitude: -79.098
+latitude: 36.936
+longitude: -79.013
 ---
\ No newline at end of file
diff --git a/content/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.md b/content/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.md
deleted file mode 100644
index a60d6190a..000000000
--- a/content/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Tire Choice Auto Service Center"
-url: /newport-news/tire-choice-auto-service-center-warwick-boulevard/
-shop: tyres
----
\ No newline at end of file
diff --git a/content/cities/newport-news/tire-choice.md b/content/cities/newport-news/tire-choice.md
new file mode 100644
index 000000000..f63e4a4fb
--- /dev/null
+++ b/content/cities/newport-news/tire-choice.md
@@ -0,0 +1,5 @@
+---
+title: "Tire Choice"
+url: /newport-news/tire-choice/
+shop: tyres
+---
\ No newline at end of file
diff --git a/content/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.md b/content/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.md
deleted file mode 100644
index 0f37d0959..000000000
--- a/content/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "CVS Pharmacy"
-url: /norfolk/cvs-pharmacy-east-little-creek-road-2/
-shop: chemist
----
\ No newline at end of file
diff --git a/content/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.md b/content/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.md
new file mode 100644
index 000000000..e39ffb6c8
--- /dev/null
+++ b/content/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "CVS Pharmacy"
+url: /norfolk/cvs-pharmacy-east-virginia-beach-boulevard/
+shop: chemist
+---
\ No newline at end of file
diff --git a/content/cities/norfolk/rite-aid-east-little-creek-road.md b/content/cities/norfolk/rite-aid-east-little-creek-road.md
deleted file mode 100644
index 608dab72a..000000000
--- a/content/cities/norfolk/rite-aid-east-little-creek-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Rite Aid"
-url: /norfolk/rite-aid-east-little-creek-road/
-shop: chemist
----
\ No newline at end of file
diff --git a/content/cities/norfolk/rite-aid-tidewater-drive.md b/content/cities/norfolk/rite-aid-tidewater-drive.md
new file mode 100644
index 000000000..4fa944367
--- /dev/null
+++ b/content/cities/norfolk/rite-aid-tidewater-drive.md
@@ -0,0 +1,5 @@
+---
+title: "Rite Aid"
+url: /norfolk/rite-aid-tidewater-drive/
+shop: chemist
+---
\ No newline at end of file
diff --git a/content/cities/norfolk/wawa-east-little-creek-road.md b/content/cities/norfolk/wawa-east-little-creek-road.md
deleted file mode 100644
index 8bbc9be57..000000000
--- a/content/cities/norfolk/wawa-east-little-creek-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Wawa"
-url: /norfolk/wawa-east-little-creek-road/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/norfolk/wawa-north-military-highway-2.md b/content/cities/norfolk/wawa-north-military-highway-2.md
new file mode 100644
index 000000000..1398e02cc
--- /dev/null
+++ b/content/cities/norfolk/wawa-north-military-highway-2.md
@@ -0,0 +1,5 @@
+---
+title: "Wawa"
+url: /norfolk/wawa-north-military-highway-2/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/north-chesterfield/kroger-hicks-road.md b/content/cities/north-chesterfield/kroger-hicks-road.md
deleted file mode 100644
index 312505379..000000000
--- a/content/cities/north-chesterfield/kroger-hicks-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Kroger"
-url: /north-chesterfield/kroger-hicks-road/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/north-chesterfield/kroger-tim-price-way.md b/content/cities/north-chesterfield/kroger-tim-price-way.md
new file mode 100644
index 000000000..be5168338
--- /dev/null
+++ b/content/cities/north-chesterfield/kroger-tim-price-way.md
@@ -0,0 +1,5 @@
+---
+title: "Kroger"
+url: /north-chesterfield/kroger-tim-price-way/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/norton/_index.md b/content/cities/norton/_index.md
index e334d621c..0d6b37862 100644
--- a/content/cities/norton/_index.md
+++ b/content/cities/norton/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Norton
 url: /norton/
-latitude: 36.939
-longitude: -82.609
+latitude: 36.933
+longitude: -82.631
 ---
\ No newline at end of file
diff --git a/content/cities/portsmouth/book-nook.md b/content/cities/portsmouth/book-nook.md
new file mode 100644
index 000000000..ff870d16e
--- /dev/null
+++ b/content/cities/portsmouth/book-nook.md
@@ -0,0 +1,5 @@
+---
+title: "Book Nook"
+url: /portsmouth/book-nook/
+shop: books
+---
\ No newline at end of file
diff --git a/content/cities/portsmouth/book-owl-bookstore.md b/content/cities/portsmouth/book-owl-bookstore.md
new file mode 100644
index 000000000..8893805ab
--- /dev/null
+++ b/content/cities/portsmouth/book-owl-bookstore.md
@@ -0,0 +1,5 @@
+---
+title: "Book Owl Bookstore"
+url: /portsmouth/book-owl-bookstore/
+shop: books
+---
\ No newline at end of file
diff --git a/content/cities/portsmouth/harris-tire-service.md b/content/cities/portsmouth/harris-tire-service.md
new file mode 100644
index 000000000..f8b700204
--- /dev/null
+++ b/content/cities/portsmouth/harris-tire-service.md
@@ -0,0 +1,5 @@
+---
+title: "Harris Tire Service"
+url: /portsmouth/harris-tire-service/
+shop: tyres
+---
\ No newline at end of file
diff --git a/content/cities/portsmouth/land-and-coates.md b/content/cities/portsmouth/land-and-coates.md
new file mode 100644
index 000000000..26336aff7
--- /dev/null
+++ b/content/cities/portsmouth/land-and-coates.md
@@ -0,0 +1,5 @@
+---
+title: "Land & Coates"
+url: /portsmouth/land-and-coates/
+shop: hardware
+---
\ No newline at end of file
diff --git a/content/cities/portsmouth/number-one-nails.md b/content/cities/portsmouth/number-one-nails.md
new file mode 100644
index 000000000..04b951d29
--- /dev/null
+++ b/content/cities/portsmouth/number-one-nails.md
@@ -0,0 +1,5 @@
+---
+title: "Number One Nails"
+url: /portsmouth/number-one-nails/
+shop: beauty
+---
\ No newline at end of file
diff --git a/content/cities/portsmouth/rite-aid-airline-boulevard.md b/content/cities/portsmouth/rite-aid-airline-boulevard.md
deleted file mode 100644
index b99bf35a0..000000000
--- a/content/cities/portsmouth/rite-aid-airline-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Rite Aid"
-url: /portsmouth/rite-aid-airline-boulevard/
-shop: chemist
----
\ No newline at end of file
diff --git a/content/cities/portsmouth/virginia-abc.md b/content/cities/portsmouth/virginia-abc.md
new file mode 100644
index 000000000..fbbd86f2d
--- /dev/null
+++ b/content/cities/portsmouth/virginia-abc.md
@@ -0,0 +1,5 @@
+---
+title: "Virginia ABC"
+url: /portsmouth/virginia-abc/
+shop: alcohol
+---
\ No newline at end of file
diff --git a/content/cities/portsmouth/warrant-realty-inc.md b/content/cities/portsmouth/warrant-realty-inc.md
deleted file mode 100644
index c80ec5e0b..000000000
--- a/content/cities/portsmouth/warrant-realty-inc.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Warrant Realty Inc."
-url: /portsmouth/warrant-realty-inc/
-shop: estate agent
----
\ No newline at end of file
diff --git a/content/cities/portsmouth/wawa-frederick-boulevard.md b/content/cities/portsmouth/wawa-frederick-boulevard.md
deleted file mode 100644
index d22f6979a..000000000
--- a/content/cities/portsmouth/wawa-frederick-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Wawa"
-url: /portsmouth/wawa-frederick-boulevard/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/portsmouth/wawa-victory-boulevard.md b/content/cities/portsmouth/wawa-victory-boulevard.md
new file mode 100644
index 000000000..b3a85c8c3
--- /dev/null
+++ b/content/cities/portsmouth/wawa-victory-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Wawa"
+url: /portsmouth/wawa-victory-boulevard/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/powhatan/_index.md b/content/cities/powhatan/_index.md
index 10b8a7668..48b809826 100644
--- a/content/cities/powhatan/_index.md
+++ b/content/cities/powhatan/_index.md
@@ -2,5 +2,5 @@
 title: Powhatan
 url: /powhatan/
 latitude: 37.539
-longitude: -77.887
+longitude: -77.885
 ---
\ No newline at end of file
diff --git a/content/cities/powhatan/food-lion-south-creek-one.md b/content/cities/powhatan/food-lion-south-creek-one.md
new file mode 100644
index 000000000..bb2aa212d
--- /dev/null
+++ b/content/cities/powhatan/food-lion-south-creek-one.md
@@ -0,0 +1,5 @@
+---
+title: "Food Lion"
+url: /powhatan/food-lion-south-creek-one/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/powhatan/virginia-abc-south-creek-one.md b/content/cities/powhatan/virginia-abc-south-creek-one.md
new file mode 100644
index 000000000..40bc03aa3
--- /dev/null
+++ b/content/cities/powhatan/virginia-abc-south-creek-one.md
@@ -0,0 +1,5 @@
+---
+title: "Virginia ABC"
+url: /powhatan/virginia-abc-south-creek-one/
+shop: alcohol
+---
\ No newline at end of file
diff --git a/content/cities/quinton/_index.md b/content/cities/quinton/_index.md
index d897fca6d..931cc18d5 100644
--- a/content/cities/quinton/_index.md
+++ b/content/cities/quinton/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Quinton
 url: /quinton/
-latitude: 37.521
-longitude: -77.186
+latitude: 37.519
+longitude: -77.185
 ---
\ No newline at end of file
diff --git a/content/cities/quinton/brooks-stitch-and-fold.md b/content/cities/quinton/brooks-stitch-and-fold.md
new file mode 100644
index 000000000..e88a3625c
--- /dev/null
+++ b/content/cities/quinton/brooks-stitch-and-fold.md
@@ -0,0 +1,5 @@
+---
+title: "Brooks Stitch & Fold"
+url: /quinton/brooks-stitch-and-fold/
+shop: laundry
+---
\ No newline at end of file
diff --git a/content/cities/quinton/hawthorne-laundry-and-dry-cleaners.md b/content/cities/quinton/hawthorne-laundry-and-dry-cleaners.md
deleted file mode 100644
index 05e38485e..000000000
--- a/content/cities/quinton/hawthorne-laundry-and-dry-cleaners.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Hawthorne Laundry & Dry Cleaners"
-url: /quinton/hawthorne-laundry-and-dry-cleaners/
-shop: laundry
----
\ No newline at end of file
diff --git a/content/cities/quinton/margeauxs-florist.md b/content/cities/quinton/margeauxs-florist.md
deleted file mode 100644
index 8e1143aca..000000000
--- a/content/cities/quinton/margeauxs-florist.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Margeaux's Florist"
-url: /quinton/margeauxs-florist/
-shop: florist
----
\ No newline at end of file
diff --git a/content/cities/quinton/new-kent-floral.md b/content/cities/quinton/new-kent-floral.md
new file mode 100644
index 000000000..f65abbec4
--- /dev/null
+++ b/content/cities/quinton/new-kent-floral.md
@@ -0,0 +1,5 @@
+---
+title: "New Kent Floral"
+url: /quinton/new-kent-floral/
+shop: florist
+---
\ No newline at end of file
diff --git a/content/cities/richmond/7-eleven-gayton-road.md b/content/cities/richmond/7-eleven-north-arch-road.md
similarity index 51%
rename from content/cities/richmond/7-eleven-gayton-road.md
rename to content/cities/richmond/7-eleven-north-arch-road.md
index 61ae0a1fe..29da6c5e5 100644
--- a/content/cities/richmond/7-eleven-gayton-road.md
+++ b/content/cities/richmond/7-eleven-north-arch-road.md
@@ -1,5 +1,5 @@
 ---
 title: "7-Eleven"
-url: /richmond/7-eleven-gayton-road/
+url: /richmond/7-eleven-north-arch-road/
 shop: convenience
 ---
\ No newline at end of file
diff --git a/content/cities/richmond/walgreens-brook-road.md b/content/cities/richmond/walgreens-brook-road.md
new file mode 100644
index 000000000..02aafdebd
--- /dev/null
+++ b/content/cities/richmond/walgreens-brook-road.md
@@ -0,0 +1,5 @@
+---
+title: "Walgreens"
+url: /richmond/walgreens-brook-road/
+shop: chemist
+---
\ No newline at end of file
diff --git a/content/cities/richmond/walgreens-hull-street-road.md b/content/cities/richmond/walgreens-hull-street-road.md
deleted file mode 100644
index 4aa20983b..000000000
--- a/content/cities/richmond/walgreens-hull-street-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Walgreens"
-url: /richmond/walgreens-hull-street-road/
-shop: chemist
----
\ No newline at end of file
diff --git a/content/cities/richmond/wawa-midlothian-turnpike-2.md b/content/cities/richmond/wawa-midlothian-turnpike-2.md
deleted file mode 100644
index 6182d435b..000000000
--- a/content/cities/richmond/wawa-midlothian-turnpike-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Wawa"
-url: /richmond/wawa-midlothian-turnpike-2/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/richmond/wawa-west-broad-street.md b/content/cities/richmond/wawa-west-broad-street.md
new file mode 100644
index 000000000..3178bfb67
--- /dev/null
+++ b/content/cities/richmond/wawa-west-broad-street.md
@@ -0,0 +1,5 @@
+---
+title: "Wawa"
+url: /richmond/wawa-west-broad-street/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/roanoke/_index.md b/content/cities/roanoke/_index.md
index a0054f4d2..f8decc8c7 100644
--- a/content/cities/roanoke/_index.md
+++ b/content/cities/roanoke/_index.md
@@ -2,5 +2,5 @@
 title: Roanoke
 url: /roanoke/
 latitude: 37.271
-longitude: -79.939
+longitude: -79.94
 ---
\ No newline at end of file
diff --git a/content/cities/roanoke/petsmart-franklin-road-southwest.md b/content/cities/roanoke/petsmart-franklin-road-southwest.md
deleted file mode 100644
index 14daa3845..000000000
--- a/content/cities/roanoke/petsmart-franklin-road-southwest.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "PetSmart"
-url: /roanoke/petsmart-franklin-road-southwest/
-shop: pet
----
\ No newline at end of file
diff --git a/content/cities/roanoke/petsmart-valley-view-boulevard-northwest.md b/content/cities/roanoke/petsmart-valley-view-boulevard-northwest.md
new file mode 100644
index 000000000..0c56f6b6d
--- /dev/null
+++ b/content/cities/roanoke/petsmart-valley-view-boulevard-northwest.md
@@ -0,0 +1,5 @@
+---
+title: "PetSmart"
+url: /roanoke/petsmart-valley-view-boulevard-northwest/
+shop: pet
+---
\ No newline at end of file
diff --git a/content/cities/roanoke/united-truck-repair-llc.md b/content/cities/roanoke/united-truck-repair-llc.md
index 5bdfe4db9..5ed34d0d8 100644
--- a/content/cities/roanoke/united-truck-repair-llc.md
+++ b/content/cities/roanoke/united-truck-repair-llc.md
@@ -1,5 +1,5 @@
 ---
-title: "UNITED TRUCK REPAIR LLC"
+title: "United Truck Repair LLC"
 url: /roanoke/united-truck-repair-llc/
 shop: shop
 ---
\ No newline at end of file
diff --git a/content/cities/sandston/7-eleven-east-williamsburg-road.md b/content/cities/sandston/7-eleven-east-williamsburg-road.md
deleted file mode 100644
index 20c97db9c..000000000
--- a/content/cities/sandston/7-eleven-east-williamsburg-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "7-Eleven"
-url: /sandston/7-eleven-east-williamsburg-road/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/sandston/7-eleven-south-airport-drive.md b/content/cities/sandston/7-eleven-south-airport-drive.md
new file mode 100644
index 000000000..3911c6b52
--- /dev/null
+++ b/content/cities/sandston/7-eleven-south-airport-drive.md
@@ -0,0 +1,5 @@
+---
+title: "7-Eleven"
+url: /sandston/7-eleven-south-airport-drive/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/smithfield/dollar-general-south-church-street.md b/content/cities/smithfield/dollar-general-south-church-street.md
new file mode 100644
index 000000000..caa0d35e0
--- /dev/null
+++ b/content/cities/smithfield/dollar-general-south-church-street.md
@@ -0,0 +1,5 @@
+---
+title: "Dollar General"
+url: /smithfield/dollar-general-south-church-street/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/blue-ridge-tobacco-and-candle.md b/content/cities/south-boston/blue-ridge-tobacco-and-candle.md
new file mode 100644
index 000000000..172cf25c2
--- /dev/null
+++ b/content/cities/south-boston/blue-ridge-tobacco-and-candle.md
@@ -0,0 +1,5 @@
+---
+title: "Blue Ridge Tobacco & Candle"
+url: /south-boston/blue-ridge-tobacco-and-candle/
+shop: tobacco
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/cricket-wireless.md b/content/cities/south-boston/cricket-wireless.md
new file mode 100644
index 000000000..6f4bc6262
--- /dev/null
+++ b/content/cities/south-boston/cricket-wireless.md
@@ -0,0 +1,5 @@
+---
+title: "Cricket Wireless"
+url: /south-boston/cricket-wireless/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/food-lion.md b/content/cities/south-boston/food-lion.md
new file mode 100644
index 000000000..ec3cb3c01
--- /dev/null
+++ b/content/cities/south-boston/food-lion.md
@@ -0,0 +1,5 @@
+---
+title: "Food Lion"
+url: /south-boston/food-lion/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/new-york-fashion.md b/content/cities/south-boston/new-york-fashion.md
new file mode 100644
index 000000000..67ee776da
--- /dev/null
+++ b/content/cities/south-boston/new-york-fashion.md
@@ -0,0 +1,5 @@
+---
+title: "New York Fashion"
+url: /south-boston/new-york-fashion/
+shop: clothes
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/reaves-trophy-shop.md b/content/cities/south-boston/reaves-trophy-shop.md
new file mode 100644
index 000000000..33153b4d2
--- /dev/null
+++ b/content/cities/south-boston/reaves-trophy-shop.md
@@ -0,0 +1,5 @@
+---
+title: "Reaves Trophy Shop"
+url: /south-boston/reaves-trophy-shop/
+shop: trophy
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/riverdale-laundry-land-laundromat.md b/content/cities/south-boston/riverdale-laundry-land-laundromat.md
new file mode 100644
index 000000000..8a8c03e2c
--- /dev/null
+++ b/content/cities/south-boston/riverdale-laundry-land-laundromat.md
@@ -0,0 +1,5 @@
+---
+title: "Riverdale Laundry Land Laundromat"
+url: /south-boston/riverdale-laundry-land-laundromat/
+shop: laundry
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/smileys-general-merchandise.md b/content/cities/south-boston/smileys-general-merchandise.md
new file mode 100644
index 000000000..1155512c0
--- /dev/null
+++ b/content/cities/south-boston/smileys-general-merchandise.md
@@ -0,0 +1,5 @@
+---
+title: "Smiley's General Merchandise"
+url: /south-boston/smileys-general-merchandise/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/smokers-vape-plus.md b/content/cities/south-boston/smokers-vape-plus.md
new file mode 100644
index 000000000..de2c3cfdd
--- /dev/null
+++ b/content/cities/south-boston/smokers-vape-plus.md
@@ -0,0 +1,5 @@
+---
+title: "Smoker's Vape Plus"
+url: /south-boston/smokers-vape-plus/
+shop: e-cigarette
+---
\ No newline at end of file
diff --git a/content/cities/south-boston/va-nails.md b/content/cities/south-boston/va-nails.md
new file mode 100644
index 000000000..01a6f1376
--- /dev/null
+++ b/content/cities/south-boston/va-nails.md
@@ -0,0 +1,5 @@
+---
+title: "VA Nails"
+url: /south-boston/va-nails/
+shop: beauty
+---
\ No newline at end of file
diff --git a/content/cities/stafford/_index.md b/content/cities/stafford/_index.md
index 79d7004d9..12e4f4ec2 100644
--- a/content/cities/stafford/_index.md
+++ b/content/cities/stafford/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Stafford
 url: /stafford/
-latitude: 38.473
-longitude: -77.436
+latitude: 38.449
+longitude: -77.4
 ---
\ No newline at end of file
diff --git a/content/cities/chesapeake/wawa-woodlake-drive.md b/content/cities/stafford/wawa-eustace-road.md
similarity index 50%
rename from content/cities/chesapeake/wawa-woodlake-drive.md
rename to content/cities/stafford/wawa-eustace-road.md
index 8f4aada93..f53db5db0 100644
--- a/content/cities/chesapeake/wawa-woodlake-drive.md
+++ b/content/cities/stafford/wawa-eustace-road.md
@@ -1,5 +1,5 @@
 ---
 title: "Wawa"
-url: /chesapeake/wawa-woodlake-drive/
+url: /stafford/wawa-eustace-road/
 shop: convenience
 ---
\ No newline at end of file
diff --git a/content/cities/suffolk/dollar-general-wilroy-road.md b/content/cities/suffolk/dollar-general-wilroy-road.md
new file mode 100644
index 000000000..baa5af295
--- /dev/null
+++ b/content/cities/suffolk/dollar-general-wilroy-road.md
@@ -0,0 +1,5 @@
+---
+title: "Dollar General"
+url: /suffolk/dollar-general-wilroy-road/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/urbanna/_index.md b/content/cities/urbanna/_index.md
index 30913e8bc..7a1023164 100644
--- a/content/cities/urbanna/_index.md
+++ b/content/cities/urbanna/_index.md
@@ -2,5 +2,5 @@
 title: Urbanna
 url: /urbanna/
 latitude: 37.636
-longitude: -76.576
+longitude: -76.579
 ---
\ No newline at end of file
diff --git a/content/cities/vienna/7-eleven-leesburg-pike-2.md b/content/cities/vienna/7-eleven-leesburg-pike-2.md
deleted file mode 100644
index 13ee004b2..000000000
--- a/content/cities/vienna/7-eleven-leesburg-pike-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "7-Eleven"
-url: /vienna/7-eleven-leesburg-pike-2/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/vienna/7-eleven-park-street-southeast.md b/content/cities/vienna/7-eleven-park-street-southeast.md
new file mode 100644
index 000000000..9dd58f704
--- /dev/null
+++ b/content/cities/vienna/7-eleven-park-street-southeast.md
@@ -0,0 +1,5 @@
+---
+title: "7-Eleven"
+url: /vienna/7-eleven-park-street-southeast/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/vienna/_index.md b/content/cities/vienna/_index.md
index 8f45f39b3..577b0b958 100644
--- a/content/cities/vienna/_index.md
+++ b/content/cities/vienna/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Vienna
 url: /vienna/
-latitude: 38.921
-longitude: -77.236
+latitude: 38.905
+longitude: -77.258
 ---
\ No newline at end of file
diff --git a/content/cities/virginia-beach/_index.md b/content/cities/virginia-beach/_index.md
index 344c48585..79f46cd0e 100644
--- a/content/cities/virginia-beach/_index.md
+++ b/content/cities/virginia-beach/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Virginia Beach
 url: /virginia-beach/
-latitude: 36.76
-longitude: -76.006
+latitude: 36.818
+longitude: -76.07
 ---
\ No newline at end of file
diff --git a/content/cities/virginia-beach/food-lion-holland-road.md b/content/cities/virginia-beach/food-lion-holland-road.md
new file mode 100644
index 000000000..b373f13c7
--- /dev/null
+++ b/content/cities/virginia-beach/food-lion-holland-road.md
@@ -0,0 +1,5 @@
+---
+title: "Food Lion"
+url: /virginia-beach/food-lion-holland-road/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/virginia-beach/food-lion-north-great-neck-road.md b/content/cities/virginia-beach/food-lion-north-great-neck-road.md
deleted file mode 100644
index b4a5c7333..000000000
--- a/content/cities/virginia-beach/food-lion-north-great-neck-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Food Lion"
-url: /virginia-beach/food-lion-north-great-neck-road/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/virginia-beach/kroger-shore-drive.md b/content/cities/virginia-beach/kroger-shore-drive.md
new file mode 100644
index 000000000..d7f2338a4
--- /dev/null
+++ b/content/cities/virginia-beach/kroger-shore-drive.md
@@ -0,0 +1,5 @@
+---
+title: "Kroger"
+url: /virginia-beach/kroger-shore-drive/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/virginia-beach/kroger-virginia-beach-boulevard.md b/content/cities/virginia-beach/kroger-virginia-beach-boulevard.md
deleted file mode 100644
index 5ba1fd215..000000000
--- a/content/cities/virginia-beach/kroger-virginia-beach-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Kroger"
-url: /virginia-beach/kroger-virginia-beach-boulevard/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/virginia-beach/rite-aid-south-rosemont-road.md b/content/cities/virginia-beach/rite-aid-south-rosemont-road.md
new file mode 100644
index 000000000..0842090b2
--- /dev/null
+++ b/content/cities/virginia-beach/rite-aid-south-rosemont-road.md
@@ -0,0 +1,5 @@
+---
+title: "Rite Aid"
+url: /virginia-beach/rite-aid-south-rosemont-road/
+shop: chemist
+---
\ No newline at end of file
diff --git a/content/cities/virginia-beach/rite-aid-upton-drive.md b/content/cities/virginia-beach/rite-aid-upton-drive.md
deleted file mode 100644
index fc3c81048..000000000
--- a/content/cities/virginia-beach/rite-aid-upton-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Rite Aid"
-url: /virginia-beach/rite-aid-upton-drive/
-shop: chemist
----
\ No newline at end of file
diff --git a/content/cities/virginia-beach/verizon-independence-boulevard.md b/content/cities/virginia-beach/verizon-independence-boulevard.md
deleted file mode 100644
index b1f3141c7..000000000
--- a/content/cities/virginia-beach/verizon-independence-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Verizon"
-url: /virginia-beach/verizon-independence-boulevard/
-shop: mobile phone
----
\ No newline at end of file
diff --git a/content/cities/virginia-beach/verizon-virginia-beach-boulevard.md b/content/cities/virginia-beach/verizon-virginia-beach-boulevard.md
new file mode 100644
index 000000000..8cfdb7009
--- /dev/null
+++ b/content/cities/virginia-beach/verizon-virginia-beach-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Verizon"
+url: /virginia-beach/verizon-virginia-beach-boulevard/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/warrenton/_index.md b/content/cities/warrenton/_index.md
index e4c07cc83..30eb26534 100644
--- a/content/cities/warrenton/_index.md
+++ b/content/cities/warrenton/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Warrenton
 url: /warrenton/
-latitude: 38.718
-longitude: -77.814
+latitude: 38.623
+longitude: -77.8
 ---
\ No newline at end of file
diff --git a/content/cities/winchester/_index.md b/content/cities/winchester/_index.md
index de32498ef..b4d4f84d9 100644
--- a/content/cities/winchester/_index.md
+++ b/content/cities/winchester/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Winchester
 url: /winchester/
-latitude: 39.16
-longitude: -78.168
+latitude: 39.22
+longitude: -78.137
 ---
\ No newline at end of file
diff --git a/content/cities/woodbridge/joy-day-spa.md b/content/cities/woodbridge/joy-day-spa.md
new file mode 100644
index 000000000..5fc64eefa
--- /dev/null
+++ b/content/cities/woodbridge/joy-day-spa.md
@@ -0,0 +1,5 @@
+---
+title: "Joy Day Spa"
+url: /woodbridge/joy-day-spa/
+shop: beauty
+---
\ No newline at end of file
diff --git a/content/cities/woodbridge/joy-nail-spa.md b/content/cities/woodbridge/joy-nail-spa.md
new file mode 100644
index 000000000..3b4a8eaef
--- /dev/null
+++ b/content/cities/woodbridge/joy-nail-spa.md
@@ -0,0 +1,5 @@
+---
+title: "Joy Nail Spa"
+url: /woodbridge/joy-nail-spa/
+shop: beauty
+---
\ No newline at end of file
diff --git a/content/cities/woodbridge/locksmith-outlet.md b/content/cities/woodbridge/locksmith-outlet.md
new file mode 100644
index 000000000..d9d248d88
--- /dev/null
+++ b/content/cities/woodbridge/locksmith-outlet.md
@@ -0,0 +1,5 @@
+---
+title: "Locksmith Outlet"
+url: /woodbridge/locksmith-outlet/
+shop: locksmith
+---
\ No newline at end of file
diff --git a/content/cities/woodbridge/yegna-ethiopian-market.md b/content/cities/woodbridge/yegna-ethiopian-market.md
new file mode 100644
index 000000000..1b69dd30b
--- /dev/null
+++ b/content/cities/woodbridge/yegna-ethiopian-market.md
@@ -0,0 +1,5 @@
+---
+title: "Yegna Ethiopian Market"
+url: /woodbridge/yegna-ethiopian-market/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/yorktown/7-eleven-george-washington-memorial-highway.md b/content/cities/yorktown/7-eleven-george-washington-memorial-highway.md
deleted file mode 100644
index 5f4db3044..000000000
--- a/content/cities/yorktown/7-eleven-george-washington-memorial-highway.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "7-Eleven"
-url: /yorktown/7-eleven-george-washington-memorial-highway/
-shop: convenience
----
\ No newline at end of file
diff --git a/data/cities/abingdon/fas-mart-porterfield-highway.yml b/data/cities/abingdon/fas-mart-porterfield-highway.yml
index 6c939b1d9..918e45271 100644
--- a/data/cities/abingdon/fas-mart-porterfield-highway.yml
+++ b/data/cities/abingdon/fas-mart-porterfield-highway.yml
@@ -1,11 +1,11 @@
-id: 604056252
+id: 620672751
 type: node
-latitude: 36.71928
-longitude: -82.00917
+latitude: 36.71942
+longitude: -82.01123
 postcode: "24210"
 city: Abingdon
 street: Porterfield Highway
-housenumber: "16085"
-phone: +1-276-628-5257
+housenumber: "16030"
+phone: +1-276-628-5238
 opening_hours: Mo-Sa 06:00-23:00; Su 07:00-23:00
 website: ""
diff --git a/data/cities/abingdon/fas-mart.yml b/data/cities/abingdon/fas-mart.yml
index 918e45271..6c939b1d9 100644
--- a/data/cities/abingdon/fas-mart.yml
+++ b/data/cities/abingdon/fas-mart.yml
@@ -1,11 +1,11 @@
-id: 620672751
+id: 604056252
 type: node
-latitude: 36.71942
-longitude: -82.01123
+latitude: 36.71928
+longitude: -82.00917
 postcode: "24210"
 city: Abingdon
 street: Porterfield Highway
-housenumber: "16030"
-phone: +1-276-628-5238
+housenumber: "16085"
+phone: +1-276-628-5257
 opening_hours: Mo-Sa 06:00-23:00; Su 07:00-23:00
 website: ""
diff --git a/data/cities/alexandria/georges-restaurant-equipment.yml b/data/cities/alexandria/georges-restaurant-equipment.yml
new file mode 100644
index 000000000..1c87c4746
--- /dev/null
+++ b/data/cities/alexandria/georges-restaurant-equipment.yml
@@ -0,0 +1,11 @@
+id: 12410877973
+type: node
+latitude: 38.80939
+longitude: -77.03938
+postcode: "22314"
+city: Alexandria
+street: North Union Street
+housenumber: "800"
+phone: (703) 836-1800
+opening_hours: Mo-Fr 08:00-16:00
+website: https://georgesre.com/
diff --git a/data/cities/alexandria/hair-cuttery-rose-hill-drive.yml b/data/cities/alexandria/hair-cuttery-rose-hill-drive.yml
new file mode 100644
index 000000000..661fd38eb
--- /dev/null
+++ b/data/cities/alexandria/hair-cuttery-rose-hill-drive.yml
@@ -0,0 +1,11 @@
+id: 5528393172
+type: node
+latitude: 38.78576
+longitude: -77.1222
+postcode: "22310"
+city: Alexandria
+street: Rose Hill Drive
+housenumber: "6050"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/alexandria/hair-cuttery-south-van-dorn-street.yml b/data/cities/alexandria/hair-cuttery-south-van-dorn-street.yml
deleted file mode 100644
index 253eb5a25..000000000
--- a/data/cities/alexandria/hair-cuttery-south-van-dorn-street.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5514947223
-type: node
-latitude: 38.81106
-longitude: -77.13343
-postcode: "22304"
-city: Alexandria
-street: South Van Dorn Street
-housenumber: "271"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/alexandria/hair-cuttery.yml b/data/cities/alexandria/hair-cuttery.yml
index 661fd38eb..253eb5a25 100644
--- a/data/cities/alexandria/hair-cuttery.yml
+++ b/data/cities/alexandria/hair-cuttery.yml
@@ -1,11 +1,11 @@
-id: 5528393172
+id: 5514947223
 type: node
-latitude: 38.78576
-longitude: -77.1222
-postcode: "22310"
+latitude: 38.81106
+longitude: -77.13343
+postcode: "22304"
 city: Alexandria
-street: Rose Hill Drive
-housenumber: "6050"
+street: South Van Dorn Street
+housenumber: "271"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/arlington/7-eleven-washington-boulevard-2.yml b/data/cities/arlington/7-eleven-washington-boulevard-2.yml
index 7a41cb7e4..91ba00cc4 100644
--- a/data/cities/arlington/7-eleven-washington-boulevard-2.yml
+++ b/data/cities/arlington/7-eleven-washington-boulevard-2.yml
@@ -1,11 +1,11 @@
-id: 2359289598
+id: 2328928001
 type: node
-latitude: 38.88528
-longitude: -77.09451
-postcode: "22201"
+latitude: 38.87965
+longitude: -77.09019
+postcode: 22201-1939
 city: Arlington
 street: Washington Boulevard
-housenumber: "3000"
-phone: +1 703-312-5105
+housenumber: "2704"
+phone: +1 703-243-4731
 opening_hours: 24/7
-website: https://www.7-eleven.com/locations/va/arlington/3000-n-washington-blvd-33679
+website: https://www.7-eleven.com/locations/va/arlington/2704-n-washington-bvd-10741
diff --git a/data/cities/arlington/7-eleven-washington-boulevard.yml b/data/cities/arlington/7-eleven-washington-boulevard.yml
index 91ba00cc4..7a41cb7e4 100644
--- a/data/cities/arlington/7-eleven-washington-boulevard.yml
+++ b/data/cities/arlington/7-eleven-washington-boulevard.yml
@@ -1,11 +1,11 @@
-id: 2328928001
+id: 2359289598
 type: node
-latitude: 38.87965
-longitude: -77.09019
-postcode: 22201-1939
+latitude: 38.88528
+longitude: -77.09451
+postcode: "22201"
 city: Arlington
 street: Washington Boulevard
-housenumber: "2704"
-phone: +1 703-243-4731
+housenumber: "3000"
+phone: +1 703-312-5105
 opening_hours: 24/7
-website: https://www.7-eleven.com/locations/va/arlington/2704-n-washington-bvd-10741
+website: https://www.7-eleven.com/locations/va/arlington/3000-n-washington-blvd-33679
diff --git a/data/cities/arlington/7-eleven-wilson-boulevard-2.yml b/data/cities/arlington/7-eleven-wilson-boulevard-2.yml
index 2873cfb87..164259f15 100644
--- a/data/cities/arlington/7-eleven-wilson-boulevard-2.yml
+++ b/data/cities/arlington/7-eleven-wilson-boulevard-2.yml
@@ -1,11 +1,11 @@
-id: 45703938
+id: 194416956
 type: node
-latitude: 38.89461
-longitude: -77.07817
-postcode: "22209"
+latitude: 38.87744
+longitude: -77.12279
+postcode: 22205-1112
 city: Arlington
 street: Wilson Boulevard
-housenumber: "1625"
-phone: +1 703-312-0405
-opening_hours: 24/7
-website: https://www.7-eleven.com/locations/va/arlington/1625-wilson-blv-34646
+housenumber: "5122"
+phone: +1 703-243-4737
+opening_hours: ""
+website: https://www.7-eleven.com/locations/va/arlington/5122-wilson-blvd-20407
diff --git a/data/cities/arlington/7-eleven-wilson-boulevard.yml b/data/cities/arlington/7-eleven-wilson-boulevard.yml
index 164259f15..2873cfb87 100644
--- a/data/cities/arlington/7-eleven-wilson-boulevard.yml
+++ b/data/cities/arlington/7-eleven-wilson-boulevard.yml
@@ -1,11 +1,11 @@
-id: 194416956
+id: 45703938
 type: node
-latitude: 38.87744
-longitude: -77.12279
-postcode: 22205-1112
+latitude: 38.89461
+longitude: -77.07817
+postcode: "22209"
 city: Arlington
 street: Wilson Boulevard
-housenumber: "5122"
-phone: +1 703-243-4737
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/arlington/5122-wilson-blvd-20407
+housenumber: "1625"
+phone: +1 703-312-0405
+opening_hours: 24/7
+website: https://www.7-eleven.com/locations/va/arlington/1625-wilson-blv-34646
diff --git a/data/cities/baskerville/triangle-grocery.yml b/data/cities/baskerville/triangle-grocery.yml
new file mode 100644
index 000000000..365e6b070
--- /dev/null
+++ b/data/cities/baskerville/triangle-grocery.yml
@@ -0,0 +1,11 @@
+id: 6322486305
+type: node
+latitude: 36.6711
+longitude: -78.28786
+postcode: "23915"
+city: Baskerville
+street: Highway 58
+housenumber: "25270"
+phone: +1-434-689-5507
+opening_hours: Mo-Sa 05:00-21:00; Su 07:00-21:00
+website: ""
diff --git a/data/cities/boston/elliotts-auto-and-equipment.yml b/data/cities/boston/elliotts-auto-and-equipment.yml
index d32210446..92b5756cf 100644
--- a/data/cities/boston/elliotts-auto-and-equipment.yml
+++ b/data/cities/boston/elliotts-auto-and-equipment.yml
@@ -7,5 +7,5 @@ city: Boston
 street: Bill Tuck Highway
 housenumber: "3020"
 phone: +1 434-572-4010
-opening_hours: ""
+opening_hours: Mo-Fr 08:00-17:30; Sa 08:00-12:00
 website: https://elliottsinc.com/
diff --git a/data/cities/boydton/triangle-grocery.yml b/data/cities/boydton/triangle-grocery.yml
new file mode 100644
index 000000000..d1feb169c
--- /dev/null
+++ b/data/cities/boydton/triangle-grocery.yml
@@ -0,0 +1,11 @@
+id: 12405951463
+type: node
+latitude: 36.66184
+longitude: -78.40741
+postcode: "23917"
+city: Boydton
+street: Highway 58
+housenumber: "18078"
+phone: +1-434-738-6365
+opening_hours: Mo-Su 05:00-21:00
+website: ""
diff --git a/data/cities/buffalo-junction/bowens-mini-mart-ii.yml b/data/cities/buffalo-junction/bowens-mini-mart-ii.yml
new file mode 100644
index 000000000..1c3fd3e0c
--- /dev/null
+++ b/data/cities/buffalo-junction/bowens-mini-mart-ii.yml
@@ -0,0 +1,11 @@
+id: 12403545473
+type: node
+latitude: 36.6485
+longitude: -78.67578
+postcode: "24529"
+city: Buffalo Junction
+street: Highway 58
+housenumber: "1600"
+phone: +1-434-374-0208
+opening_hours: Mo-Th 06:00-20:00; Fr 06:00-20:30; Sa-Su 06:00-21:00
+website: ""
diff --git a/data/cities/charlottesville/blue-whale-books.yml b/data/cities/charlottesville/blue-whale-books.yml
new file mode 100644
index 000000000..ebefbb61d
--- /dev/null
+++ b/data/cities/charlottesville/blue-whale-books.yml
@@ -0,0 +1,11 @@
+id: 8172349877
+type: node
+latitude: 38.03106
+longitude: -78.48202
+postcode: "22902"
+city: Charlottesville
+street: West Main Street
+housenumber: "115"
+phone: ""
+opening_hours: Su-Th 10:00-21:00; Fr-Sa 10:00-22:00
+website: ""
diff --git a/data/cities/charlottesville/heartwood-books.yml b/data/cities/charlottesville/heartwood-books.yml
new file mode 100644
index 000000000..0ceffef80
--- /dev/null
+++ b/data/cities/charlottesville/heartwood-books.yml
@@ -0,0 +1,11 @@
+id: 8172365687
+type: node
+latitude: 38.03584
+longitude: -78.50047
+postcode: "22903"
+city: Charlottesville
+street: Elliewood Avenue
+housenumber: "5"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/charlottesville/hello-comics-downtown.yml b/data/cities/charlottesville/hello-comics-downtown.yml
new file mode 100644
index 000000000..3597b62cc
--- /dev/null
+++ b/data/cities/charlottesville/hello-comics-downtown.yml
@@ -0,0 +1,11 @@
+id: 12410112915
+type: node
+latitude: 38.03121
+longitude: -78.48248
+postcode: "22902"
+city: Charlottesville
+street: West Main Street
+housenumber: "211"
+phone: ""
+opening_hours: ""
+website: https://www.hellocomics.net/
diff --git a/data/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.yml b/data/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.yml
deleted file mode 100644
index a28b30d47..000000000
--- a/data/cities/charlottesville/ikes-underground-vintage-clothing-and-strange-cargo.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3894472533
-type: node
-latitude: 38.02985
-longitude: -78.47891
-postcode: "22902"
-city: Charlottesville
-street: East Main Street
-housenumber: "414"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/charlottesville/oakleys-gently-used-books.yml b/data/cities/charlottesville/oakleys-gently-used-books.yml
deleted file mode 100644
index 57d71f92e..000000000
--- a/data/cities/charlottesville/oakleys-gently-used-books.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3893014167
-type: node
-latitude: 38.03077
-longitude: -78.4819
-postcode: "22902"
-city: Charlottesville
-street: West Main Street
-housenumber: "112"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.yml b/data/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.yml
deleted file mode 100644
index d0db75aa5..000000000
--- a/data/cities/charlottesville/telegraph-art-and-comics-4th-street-northeast.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 386112909
-type: node
-latitude: 38.03046
-longitude: -78.4788
-postcode: "22902"
-city: Charlottesville
-street: 4th Street Northeast
-housenumber: "110"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/charlottesville/twisted-branch-tea-bazaar.yml b/data/cities/charlottesville/twisted-branch-tea-bazaar.yml
index 5a91d5c01..011bc92f9 100644
--- a/data/cities/charlottesville/twisted-branch-tea-bazaar.yml
+++ b/data/cities/charlottesville/twisted-branch-tea-bazaar.yml
@@ -1,7 +1,7 @@
 id: 3894472539
 type: node
 latitude: 38.02986
-longitude: -78.47894
+longitude: -78.47893
 postcode: "22902"
 city: Charlottesville
 street: East Main Street
diff --git a/data/cities/chesapeake/7-eleven-bainbridge-boulevard-2.yml b/data/cities/chesapeake/7-eleven-bainbridge-boulevard-2.yml
index db06e43c9..88d5eef84 100644
--- a/data/cities/chesapeake/7-eleven-bainbridge-boulevard-2.yml
+++ b/data/cities/chesapeake/7-eleven-bainbridge-boulevard-2.yml
@@ -1,11 +1,11 @@
-id: 312298173
+id: 312459345
 type: node
-latitude: 36.78622
-longitude: -76.28136
+latitude: 36.80473
+longitude: -76.27569
 postcode: "23324"
 city: Chesapeake
 street: Bainbridge Boulevard
-housenumber: "4001"
-phone: +1 757-545-4471
+housenumber: "2115"
+phone: +1 757-543-9877
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/chesapeake/4001-bainbridge-bvd-16975
+website: https://www.7-eleven.com/locations/va/chesapeake/2115-bainbridge-blvd-22751
diff --git a/data/cities/chesapeake/7-eleven-bainbridge-boulevard.yml b/data/cities/chesapeake/7-eleven-bainbridge-boulevard.yml
index 88d5eef84..db06e43c9 100644
--- a/data/cities/chesapeake/7-eleven-bainbridge-boulevard.yml
+++ b/data/cities/chesapeake/7-eleven-bainbridge-boulevard.yml
@@ -1,11 +1,11 @@
-id: 312459345
+id: 312298173
 type: node
-latitude: 36.80473
-longitude: -76.27569
+latitude: 36.78622
+longitude: -76.28136
 postcode: "23324"
 city: Chesapeake
 street: Bainbridge Boulevard
-housenumber: "2115"
-phone: +1 757-543-9877
+housenumber: "4001"
+phone: +1 757-545-4471
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/chesapeake/2115-bainbridge-blvd-22751
+website: https://www.7-eleven.com/locations/va/chesapeake/4001-bainbridge-bvd-16975
diff --git a/data/cities/chesapeake/advance-auto-parts-george-washington-highway-south.yml b/data/cities/chesapeake/advance-auto-parts-george-washington-highway-south.yml
deleted file mode 100644
index ab540f39b..000000000
--- a/data/cities/chesapeake/advance-auto-parts-george-washington-highway-south.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 312346037
-type: node
-latitude: 36.73952
-longitude: -76.34364
-postcode: "23323"
-city: Chesapeake
-street: George Washington Highway South
-housenumber: "113"
-phone: ""
-opening_hours: ""
-website: https://stores.advanceautoparts.com/va/chesapeake/113-george-washington-hwy-s
diff --git a/data/cities/chesapeake/advance-auto-parts-western-branch-boulevard.yml b/data/cities/chesapeake/advance-auto-parts-western-branch-boulevard.yml
new file mode 100644
index 000000000..02473f7eb
--- /dev/null
+++ b/data/cities/chesapeake/advance-auto-parts-western-branch-boulevard.yml
@@ -0,0 +1,11 @@
+id: 312161268
+type: node
+latitude: 36.86133
+longitude: -76.39995
+postcode: "23321"
+city: Chesapeake
+street: Western Branch Boulevard
+housenumber: "3103"
+phone: ""
+opening_hours: ""
+website: https://stores.advanceautoparts.com/va/chesapeake/3103-western-branch-blvd
diff --git a/data/cities/chesapeake/advance-auto-parts.yml b/data/cities/chesapeake/advance-auto-parts.yml
index 02473f7eb..ab540f39b 100644
--- a/data/cities/chesapeake/advance-auto-parts.yml
+++ b/data/cities/chesapeake/advance-auto-parts.yml
@@ -1,11 +1,11 @@
-id: 312161268
+id: 312346037
 type: node
-latitude: 36.86133
-longitude: -76.39995
-postcode: "23321"
+latitude: 36.73952
+longitude: -76.34364
+postcode: "23323"
 city: Chesapeake
-street: Western Branch Boulevard
-housenumber: "3103"
+street: George Washington Highway South
+housenumber: "113"
 phone: ""
 opening_hours: ""
-website: https://stores.advanceautoparts.com/va/chesapeake/3103-western-branch-blvd
+website: https://stores.advanceautoparts.com/va/chesapeake/113-george-washington-hwy-s
diff --git a/data/cities/chesapeake/dollar-tree-2.yml b/data/cities/chesapeake/dollar-tree-2.yml
new file mode 100644
index 000000000..8259de3b9
--- /dev/null
+++ b/data/cities/chesapeake/dollar-tree-2.yml
@@ -0,0 +1,11 @@
+id: 6416667591
+type: node
+latitude: 36.82322
+longitude: -76.42114
+postcode: ""
+city: Chesapeake
+street: ""
+housenumber: ""
+phone: ""
+opening_hours: Mo-Sa 08:00-22:00; Su 08:00-20:00
+website: https://www.dollartree.com/locations/va/chesapeake/95/
diff --git a/data/cities/chesapeake/dollar-tree.yml b/data/cities/chesapeake/dollar-tree.yml
index 8259de3b9..6d15d592f 100644
--- a/data/cities/chesapeake/dollar-tree.yml
+++ b/data/cities/chesapeake/dollar-tree.yml
@@ -1,11 +1,11 @@
-id: 6416667591
+id: 3181988349
 type: node
-latitude: 36.82322
-longitude: -76.42114
-postcode: ""
+latitude: 36.86414
+longitude: -76.4033
+postcode: "23321"
 city: Chesapeake
-street: ""
-housenumber: ""
-phone: ""
-opening_hours: Mo-Sa 08:00-22:00; Su 08:00-20:00
-website: https://www.dollartree.com/locations/va/chesapeake/95/
+street: Western Branch Boulevard
+housenumber: "3146"
+phone: +1-757-381-8095
+opening_hours: Mo-Sa 08:00-22:00; Su 08:00-21:00
+website: https://www.dollartree.com/locations/va/chesapeake/283/
diff --git a/data/cities/chesapeake/firestone-chesapeake-square-ring-road.yml b/data/cities/chesapeake/firestone-chesapeake-square-ring-road.yml
new file mode 100644
index 000000000..3ecb6722f
--- /dev/null
+++ b/data/cities/chesapeake/firestone-chesapeake-square-ring-road.yml
@@ -0,0 +1,11 @@
+id: 312169773
+type: node
+latitude: 36.8278
+longitude: -76.41054
+postcode: "23321"
+city: Chesapeake
+street: Chesapeake Square Ring Road
+housenumber: "2408"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/chesapeake/firestone-hillcrest-parkway.yml b/data/cities/chesapeake/firestone-hillcrest-parkway.yml
deleted file mode 100644
index 0cc02927d..000000000
--- a/data/cities/chesapeake/firestone-hillcrest-parkway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 312783155
-type: node
-latitude: 36.6569
-longitude: -76.22406
-postcode: "23322"
-city: Chesapeake
-street: Hillcrest Parkway
-housenumber: "133"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/chesapeake/firestone.yml b/data/cities/chesapeake/firestone.yml
index 3ecb6722f..0cc02927d 100644
--- a/data/cities/chesapeake/firestone.yml
+++ b/data/cities/chesapeake/firestone.yml
@@ -1,11 +1,11 @@
-id: 312169773
+id: 312783155
 type: node
-latitude: 36.8278
-longitude: -76.41054
-postcode: "23321"
+latitude: 36.6569
+longitude: -76.22406
+postcode: "23322"
 city: Chesapeake
-street: Chesapeake Square Ring Road
-housenumber: "2408"
+street: Hillcrest Parkway
+housenumber: "133"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/chesapeake/kramer-tire-battlefield-boulevard-north.yml b/data/cities/chesapeake/kramer-tire-battlefield-boulevard-north.yml
deleted file mode 100644
index 833931157..000000000
--- a/data/cities/chesapeake/kramer-tire-battlefield-boulevard-north.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 312648850
-type: node
-latitude: 36.75079
-longitude: -76.24588
-postcode: "23320"
-city: Chesapeake
-street: Battlefield Boulevard North
-housenumber: "849"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/chesapeake/kramer-tire-western-branch-boulevard.yml b/data/cities/chesapeake/kramer-tire-western-branch-boulevard.yml
new file mode 100644
index 000000000..66bc84940
--- /dev/null
+++ b/data/cities/chesapeake/kramer-tire-western-branch-boulevard.yml
@@ -0,0 +1,11 @@
+id: 312165368
+type: node
+latitude: 36.86587
+longitude: -76.41262
+postcode: "23321"
+city: Chesapeake
+street: Western Branch Boulevard
+housenumber: "3300"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/chesapeake/kramer-tire.yml b/data/cities/chesapeake/kramer-tire.yml
index 66bc84940..833931157 100644
--- a/data/cities/chesapeake/kramer-tire.yml
+++ b/data/cities/chesapeake/kramer-tire.yml
@@ -1,11 +1,11 @@
-id: 312165368
+id: 312648850
 type: node
-latitude: 36.86587
-longitude: -76.41262
-postcode: "23321"
+latitude: 36.75079
+longitude: -76.24588
+postcode: "23320"
 city: Chesapeake
-street: Western Branch Boulevard
-housenumber: "3300"
+street: Battlefield Boulevard North
+housenumber: "849"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/chesapeake/mattress-firm-carmichael-way.yml b/data/cities/chesapeake/mattress-firm-carmichael-way.yml
new file mode 100644
index 000000000..c8a18e42a
--- /dev/null
+++ b/data/cities/chesapeake/mattress-firm-carmichael-way.yml
@@ -0,0 +1,11 @@
+id: 3158641431
+type: node
+latitude: 36.6595
+longitude: -76.23444
+postcode: "23322"
+city: Chesapeake
+street: Carmichael Way
+housenumber: "237"
+phone: +1 757-421-2081
+opening_hours: ""
+website: https://www.mattressfirm.com/en-us/stores/va/chesapeake/061180/
diff --git a/data/cities/chesapeake/mattress-firm-crossways-boulevard.yml b/data/cities/chesapeake/mattress-firm-crossways-boulevard.yml
deleted file mode 100644
index f7f0c8063..000000000
--- a/data/cities/chesapeake/mattress-firm-crossways-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3157407177
-type: node
-latitude: 36.77725
-longitude: -76.23193
-postcode: "23320"
-city: Chesapeake
-street: Crossways Boulevard
-housenumber: "1624"
-phone: +1 757-420-1800
-opening_hours: ""
-website: https://www.mattressfirm.com/en-us/stores/va/chesapeake/061016/
diff --git a/data/cities/chesapeake/mattress-firm.yml b/data/cities/chesapeake/mattress-firm.yml
index c8a18e42a..f7f0c8063 100644
--- a/data/cities/chesapeake/mattress-firm.yml
+++ b/data/cities/chesapeake/mattress-firm.yml
@@ -1,11 +1,11 @@
-id: 3158641431
+id: 3157407177
 type: node
-latitude: 36.6595
-longitude: -76.23444
-postcode: "23322"
+latitude: 36.77725
+longitude: -76.23193
+postcode: "23320"
 city: Chesapeake
-street: Carmichael Way
-housenumber: "237"
-phone: +1 757-421-2081
+street: Crossways Boulevard
+housenumber: "1624"
+phone: +1 757-420-1800
 opening_hours: ""
-website: https://www.mattressfirm.com/en-us/stores/va/chesapeake/061180/
+website: https://www.mattressfirm.com/en-us/stores/va/chesapeake/061016/
diff --git a/data/cities/chesapeake/the-home-depot-hillcrest-parkway.yml b/data/cities/chesapeake/the-home-depot-hillcrest-parkway.yml
deleted file mode 100644
index 5100a28fd..000000000
--- a/data/cities/chesapeake/the-home-depot-hillcrest-parkway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 312783156
-type: node
-latitude: 36.65596
-longitude: -76.22718
-postcode: "23322"
-city: Chesapeake
-street: Hillcrest Parkway
-housenumber: "157"
-phone: +1 757-421-3167
-opening_hours: Mo-Sa 06:00-22:00; Su 08:00-20:00
-website: https://www.homedepot.com/l/s-chesapeake/va/chesapeake/23322/4656
diff --git a/data/cities/chesapeake/the-home-depot-old-taylor-road.yml b/data/cities/chesapeake/the-home-depot-old-taylor-road.yml
new file mode 100644
index 000000000..72af223e2
--- /dev/null
+++ b/data/cities/chesapeake/the-home-depot-old-taylor-road.yml
@@ -0,0 +1,11 @@
+id: 312169782
+type: node
+latitude: 36.82819
+longitude: -76.40693
+postcode: "23321"
+city: Chesapeake
+street: Old Taylor Road
+housenumber: "2421"
+phone: +1 757-465-9166
+opening_hours: Mo-Sa 06:00-22:00; Su 08:00-20:00
+website: https://www.homedepot.com/l/Portsmouth-VA/VA/Chesapeake/23321/4622
diff --git a/data/cities/chesapeake/the-home-depot.yml b/data/cities/chesapeake/the-home-depot.yml
index 72af223e2..5100a28fd 100644
--- a/data/cities/chesapeake/the-home-depot.yml
+++ b/data/cities/chesapeake/the-home-depot.yml
@@ -1,11 +1,11 @@
-id: 312169782
+id: 312783156
 type: node
-latitude: 36.82819
-longitude: -76.40693
-postcode: "23321"
+latitude: 36.65596
+longitude: -76.22718
+postcode: "23322"
 city: Chesapeake
-street: Old Taylor Road
-housenumber: "2421"
-phone: +1 757-465-9166
+street: Hillcrest Parkway
+housenumber: "157"
+phone: +1 757-421-3167
 opening_hours: Mo-Sa 06:00-22:00; Su 08:00-20:00
-website: https://www.homedepot.com/l/Portsmouth-VA/VA/Chesapeake/23321/4622
+website: https://www.homedepot.com/l/s-chesapeake/va/chesapeake/23322/4656
diff --git a/data/cities/chesapeake/wawa-western-branch-boulevard.yml b/data/cities/chesapeake/wawa-western-branch-boulevard.yml
new file mode 100644
index 000000000..cf7e292cc
--- /dev/null
+++ b/data/cities/chesapeake/wawa-western-branch-boulevard.yml
@@ -0,0 +1,11 @@
+id: 312165491
+type: node
+latitude: 36.86635
+longitude: -76.41602
+postcode: "23321"
+city: Chesapeake
+street: Western Branch Boulevard
+housenumber: "3408"
+phone: +1 757-638-6431
+opening_hours: 24/7
+website: https://www.wawa.com/locations/695
diff --git a/data/cities/chesapeake/wawa-woodlake-drive.yml b/data/cities/chesapeake/wawa-woodlake-drive.yml
deleted file mode 100644
index 9f3b6d199..000000000
--- a/data/cities/chesapeake/wawa-woodlake-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 312598201
-type: node
-latitude: 36.79094
-longitude: -76.23564
-postcode: "23320"
-city: Chesapeake
-street: Woodlake Drive
-housenumber: "720"
-phone: +1 757-420-3053
-opening_hours: 24/7
-website: https://www.wawa.com/locations/654
diff --git a/data/cities/chesapeake/wawa.yml b/data/cities/chesapeake/wawa.yml
index cf7e292cc..9f3b6d199 100644
--- a/data/cities/chesapeake/wawa.yml
+++ b/data/cities/chesapeake/wawa.yml
@@ -1,11 +1,11 @@
-id: 312165491
+id: 312598201
 type: node
-latitude: 36.86635
-longitude: -76.41602
-postcode: "23321"
+latitude: 36.79094
+longitude: -76.23564
+postcode: "23320"
 city: Chesapeake
-street: Western Branch Boulevard
-housenumber: "3408"
-phone: +1 757-638-6431
+street: Woodlake Drive
+housenumber: "720"
+phone: +1 757-420-3053
 opening_hours: 24/7
-website: https://www.wawa.com/locations/695
+website: https://www.wawa.com/locations/654
diff --git a/data/cities/mecklenburg-county/7-eleven.yml b/data/cities/clarksville/7-eleven-virginia-avenue.yml
similarity index 84%
rename from data/cities/mecklenburg-county/7-eleven.yml
rename to data/cities/clarksville/7-eleven-virginia-avenue.yml
index 2cca481fd..014184b36 100644
--- a/data/cities/mecklenburg-county/7-eleven.yml
+++ b/data/cities/clarksville/7-eleven-virginia-avenue.yml
@@ -3,9 +3,9 @@ type: node
 latitude: 36.62486
 longitude: -78.55716
 postcode: "23927"
-city: Mecklenburg County
+city: Clarksville
 street: Virginia Avenue
 housenumber: "402"
 phone: +1 434-374-2003
-opening_hours: ""
+opening_hours: 24/7
 website: https://www.7-eleven.com/locations/va/clarksville/402-virginia-ave.-40002
diff --git a/data/cities/clarksville/aplus.yml b/data/cities/clarksville/7-eleven.yml
similarity index 57%
rename from data/cities/clarksville/aplus.yml
rename to data/cities/clarksville/7-eleven.yml
index 359a7f3f3..119b6e91e 100644
--- a/data/cities/clarksville/aplus.yml
+++ b/data/cities/clarksville/7-eleven.yml
@@ -4,8 +4,8 @@ latitude: 36.63539
 longitude: -78.54149
 postcode: "23927"
 city: Clarksville
-street: VA 49
-housenumber: "8098"
-phone: ""
-opening_hours: ""
+street: US Highway 15
+housenumber: "8188"
+phone: +1-434-374-9808
+opening_hours: 24/7
 website: ""
diff --git a/data/cities/clarksville/a2z-hobby.yml b/data/cities/clarksville/a2z-hobby.yml
new file mode 100644
index 000000000..acb776bc5
--- /dev/null
+++ b/data/cities/clarksville/a2z-hobby.yml
@@ -0,0 +1,11 @@
+id: 9965024737
+type: node
+latitude: 36.62556
+longitude: -78.55547
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "304"
+phone: +1-434-374-5777
+opening_hours: Tu-We,Fr-Sa 11:00-18:00
+website: ""
diff --git a/data/cities/clarksville/art-and-books.yml b/data/cities/clarksville/art-and-books.yml
new file mode 100644
index 000000000..b3d73fc7f
--- /dev/null
+++ b/data/cities/clarksville/art-and-books.yml
@@ -0,0 +1,11 @@
+id: 12125725796
+type: node
+latitude: 36.62333
+longitude: -78.55852
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "603"
+phone: ""
+opening_hours: We-Sa 12:00-17:00
+website: ""
diff --git a/data/cities/clarksville/buggs-island-baby-and-childrens-clothing.yml b/data/cities/clarksville/buggs-island-baby-and-childrens-clothing.yml
new file mode 100644
index 000000000..6d3f549a3
--- /dev/null
+++ b/data/cities/clarksville/buggs-island-baby-and-childrens-clothing.yml
@@ -0,0 +1,11 @@
+id: 12125725707
+type: node
+latitude: 36.62479
+longitude: -78.55604
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "331"
+phone: +1-434-777-3312
+opening_hours: Tu-Fr 10:00-17:00; Sa 10:00-15:00
+website: ""
diff --git a/data/cities/clarksville/buggs-island-bait-and-tackle.yml b/data/cities/clarksville/buggs-island-bait-and-tackle.yml
new file mode 100644
index 000000000..d329ef1ab
--- /dev/null
+++ b/data/cities/clarksville/buggs-island-bait-and-tackle.yml
@@ -0,0 +1,12 @@
+id: 12405951437
+type: node
+latitude: 36.63545
+longitude: -78.54139
+postcode: "23927"
+city: Clarksville
+street: US Highway 15
+housenumber: "8188"
+phone: +1-434-374-5545
+opening_hours: Mo 07:00-15:00; Tu,Th 07:00-16:00; Fr 06:00-19:00; Sa 05:00-19:00;
+    Su 06:00-15:00
+website: ""
diff --git a/data/cities/clarksville/ace-hardware.yml b/data/cities/clarksville/clarksville-ace-hardware.yml
similarity index 88%
rename from data/cities/clarksville/ace-hardware.yml
rename to data/cities/clarksville/clarksville-ace-hardware.yml
index 1b90de25e..4576abbdd 100644
--- a/data/cities/clarksville/ace-hardware.yml
+++ b/data/cities/clarksville/clarksville-ace-hardware.yml
@@ -4,7 +4,7 @@ latitude: 36.61523
 longitude: -78.58373
 postcode: "23927"
 city: Clarksville
-street: Highway Fifty Eight
+street: Highway 58 Business
 housenumber: "7545"
 phone: +1 434-374-8629
 opening_hours: Mo-Sa 07:00-19:00; Su 08:00-16:00
diff --git a/data/cities/clarksville/clarksville-coin-laundry.yml b/data/cities/clarksville/clarksville-coin-laundry.yml
new file mode 100644
index 000000000..200263a2a
--- /dev/null
+++ b/data/cities/clarksville/clarksville-coin-laundry.yml
@@ -0,0 +1,11 @@
+id: 12403545606
+type: node
+latitude: 36.62029
+longitude: -78.5687
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "1004"
+phone: +1-434-793-2011
+opening_hours: 07:00-21:00
+website: http://www.laundrylandlaundromats.com/store/clarksville/
diff --git a/data/cities/clarksville/clarksville-discount-outlet.yml b/data/cities/clarksville/clarksville-discount-outlet.yml
new file mode 100644
index 000000000..839b566c1
--- /dev/null
+++ b/data/cities/clarksville/clarksville-discount-outlet.yml
@@ -0,0 +1,11 @@
+id: 9965024854
+type: node
+latitude: 36.62529
+longitude: -78.55583
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "316"
+phone: +1-540-664-4630
+opening_hours: Fr-Sa 10:00-18:00
+website: ""
diff --git a/data/cities/clarksville/clarksville-furniture-co.yml b/data/cities/clarksville/clarksville-furniture-co.yml
new file mode 100644
index 000000000..b049263aa
--- /dev/null
+++ b/data/cities/clarksville/clarksville-furniture-co.yml
@@ -0,0 +1,11 @@
+id: 12125725797
+type: node
+latitude: 36.6234
+longitude: -78.55841
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "601"
+phone: +1-434-374-8133
+opening_hours: Mo-Fr 10:00-17:00; Sa 10:00-15:00
+website: https://clarksville-flooring.com/
diff --git a/data/cities/clarksville/clarksville-hair-salon.yml b/data/cities/clarksville/clarksville-hair-salon.yml
new file mode 100644
index 000000000..438c96906
--- /dev/null
+++ b/data/cities/clarksville/clarksville-hair-salon.yml
@@ -0,0 +1,11 @@
+id: 12405948896
+type: node
+latitude: 36.62439
+longitude: -78.55665
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "403"
+phone: +1-434-362-2201
+opening_hours: Mo 08:00-17:00; Tu-Fr 09:00-18:00; Sa 10:00-16:00
+website: ""
diff --git a/data/cities/clarksville/clarksville-ruritan-club-thrift-shop.yml b/data/cities/clarksville/clarksville-ruritan-club-thrift-shop.yml
new file mode 100644
index 000000000..a4515e83e
--- /dev/null
+++ b/data/cities/clarksville/clarksville-ruritan-club-thrift-shop.yml
@@ -0,0 +1,11 @@
+id: 12405951408
+type: node
+latitude: 36.62494
+longitude: -78.55441
+postcode: "23927"
+city: Clarksville
+street: 3rd Street
+housenumber: "207"
+phone: +1-434-374-8080
+opening_hours: Fr 09:00-17:00; Sa 09:00-15:00
+website: ""
diff --git a/data/cities/clarksville/dollar-general.yml b/data/cities/clarksville/dollar-general.yml
new file mode 100644
index 000000000..6f3a7038c
--- /dev/null
+++ b/data/cities/clarksville/dollar-general.yml
@@ -0,0 +1,11 @@
+id: 1230855898
+type: node
+latitude: 36.62332
+longitude: -78.56047
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "700"
+phone: +1-864-977-8540
+opening_hours: Mo-Su 08:00-20:00
+website: https://www.dollargeneral.com/store-directory/va/clarksville/3018
diff --git a/data/cities/clarksville/food-lion.yml b/data/cities/clarksville/food-lion.yml
new file mode 100644
index 000000000..b53b2c81f
--- /dev/null
+++ b/data/cities/clarksville/food-lion.yml
@@ -0,0 +1,11 @@
+id: 2601635418
+type: node
+latitude: 36.61841
+longitude: -78.56939
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "1013"
+phone: +1-434-374-9530
+opening_hours: Mo-Su 07:00-23:00
+website: ""
diff --git a/data/cities/clarksville/grandfathers-country-creations.yml b/data/cities/clarksville/grandfathers-country-creations.yml
new file mode 100644
index 000000000..2bfe1d5a8
--- /dev/null
+++ b/data/cities/clarksville/grandfathers-country-creations.yml
@@ -0,0 +1,11 @@
+id: 9965025296
+type: node
+latitude: 36.62581
+longitude: -78.55504
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "214"
+phone: +1-434-374-2576
+opening_hours: Fr-Sa 10:30-16:00
+website: ""
diff --git a/data/cities/clarksville/hites-clothing-store.yml b/data/cities/clarksville/hites-clothing-store.yml
index 8e5c58c27..191e30784 100644
--- a/data/cities/clarksville/hites-clothing-store.yml
+++ b/data/cities/clarksville/hites-clothing-store.yml
@@ -6,6 +6,6 @@ postcode: "23927"
 city: Clarksville
 street: Virginia Avenue
 housenumber: "301"
-phone: ""
-opening_hours: ""
+phone: +1-434-374-5914
+opening_hours: Mo-Fr 10:00-17:00; Sa 10:00-15:00
 website: https://www.hitesclothing.com/
diff --git a/data/cities/clarksville/lake-country-barber-shop.yml b/data/cities/clarksville/lake-country-barber-shop.yml
new file mode 100644
index 000000000..4e52cbd64
--- /dev/null
+++ b/data/cities/clarksville/lake-country-barber-shop.yml
@@ -0,0 +1,11 @@
+id: 12125725795
+type: node
+latitude: 36.62329
+longitude: -78.55862
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "605"
+phone: ""
+opening_hours: Mo-We,Fr 08:00-17:00; Sa 08:00-13:00
+website: ""
diff --git a/data/cities/clarksville/moores-chevrolet.yml b/data/cities/clarksville/moores-chevrolet.yml
new file mode 100644
index 000000000..664a3e623
--- /dev/null
+++ b/data/cities/clarksville/moores-chevrolet.yml
@@ -0,0 +1,11 @@
+id: 12403545581
+type: node
+latitude: 36.61487
+longitude: -78.58476
+postcode: "23927"
+city: Clarksville
+street: Highway 58 Business
+housenumber: "7459"
+phone: +1-434-374-2104
+opening_hours: Mo-Fr 08:00-18:00; Sa 08:00-13:00
+website: ""
diff --git a/data/cities/clarksville/oreilly-auto-parts.yml b/data/cities/clarksville/oreilly-auto-parts.yml
index b9ae10bda..0caf3c4fd 100644
--- a/data/cities/clarksville/oreilly-auto-parts.yml
+++ b/data/cities/clarksville/oreilly-auto-parts.yml
@@ -4,7 +4,7 @@ latitude: 36.61249
 longitude: -78.59002
 postcode: "23927"
 city: Clarksville
-street: Howell Pl
+street: Howell Place
 housenumber: "51"
 phone: +1-434-374-1341
 opening_hours: Mo-Sa 07:30-21:00; Su 09:00-20:00
diff --git a/data/cities/clarksville/sweet-violet.yml b/data/cities/clarksville/sweet-violet.yml
new file mode 100644
index 000000000..7ef2ae39d
--- /dev/null
+++ b/data/cities/clarksville/sweet-violet.yml
@@ -0,0 +1,11 @@
+id: 12125725705
+type: node
+latitude: 36.6247
+longitude: -78.55617
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "335"
+phone: +1-434-660-5556
+opening_hours: We-Sa 10:00-18:00; Su 13:00-17:00
+website: ""
diff --git a/data/cities/clarksville/the-antique-market.yml b/data/cities/clarksville/the-antique-market.yml
new file mode 100644
index 000000000..392ef6a05
--- /dev/null
+++ b/data/cities/clarksville/the-antique-market.yml
@@ -0,0 +1,11 @@
+id: 12125725714
+type: node
+latitude: 36.6251
+longitude: -78.5556
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "315"
+phone: +1-804-339-2635
+opening_hours: Tu-Sa 10:00-17:00
+website: ""
diff --git a/data/cities/clarksville/the-corner-at-two-one-six.yml b/data/cities/clarksville/the-corner-at-two-one-six.yml
new file mode 100644
index 000000000..1f93eecb5
--- /dev/null
+++ b/data/cities/clarksville/the-corner-at-two-one-six.yml
@@ -0,0 +1,11 @@
+id: 9965024998
+type: node
+latitude: 36.62573
+longitude: -78.55521
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "216"
+phone: +1-434-374-5999
+opening_hours: Tu-Sa 10:00-17:00
+website: http://www.thecornerattwoonesix.com/
diff --git a/data/cities/clarksville/the-hound-and-quill-trading-company.yml b/data/cities/clarksville/the-hound-and-quill-trading-company.yml
new file mode 100644
index 000000000..4d7e9099d
--- /dev/null
+++ b/data/cities/clarksville/the-hound-and-quill-trading-company.yml
@@ -0,0 +1,11 @@
+id: 9965024627
+type: node
+latitude: 36.62535
+longitude: -78.55575
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "312"
+phone: +1-302-463-5227
+opening_hours: Mo-Sa 10:00-18:00
+website: ""
diff --git a/data/cities/clarksville/tractor-supply-company.yml b/data/cities/clarksville/tractor-supply-company.yml
index 6169167fa..cfd3e6a21 100644
--- a/data/cities/clarksville/tractor-supply-company.yml
+++ b/data/cities/clarksville/tractor-supply-company.yml
@@ -7,5 +7,5 @@ city: Clarksville
 street: Gateway Lane
 housenumber: "67"
 phone: +1 434-362-2008
-opening_hours: Mo-Sa 08:00-20:00; Su 09:00-19:00
+opening_hours: Mo-Sa 08:00-21:00; Su 09:00-19:00
 website: https://www.tractorsupply.com/
diff --git a/data/cities/clarksville/verizon.yml b/data/cities/clarksville/verizon.yml
new file mode 100644
index 000000000..1620e159f
--- /dev/null
+++ b/data/cities/clarksville/verizon.yml
@@ -0,0 +1,11 @@
+id: 12125725794
+type: node
+latitude: 36.62322
+longitude: -78.55871
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "607"
+phone: +1-434-374-2395
+opening_hours: Mo-Sa 10:00-20:00; Su 11:00-17:00
+website: ""
diff --git a/data/cities/clarksville/virginia-abc.yml b/data/cities/clarksville/virginia-abc.yml
new file mode 100644
index 000000000..f1b444516
--- /dev/null
+++ b/data/cities/clarksville/virginia-abc.yml
@@ -0,0 +1,11 @@
+id: 12405948894
+type: node
+latitude: 36.62348
+longitude: -78.55887
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "608"
+phone: +1-434-374-5400
+opening_hours: Mo-Sa 10:00-21:00; Su 12:00-18:00
+website: ""
diff --git a/data/cities/clarksville/virginia-avenue-mall.yml b/data/cities/clarksville/virginia-avenue-mall.yml
new file mode 100644
index 000000000..f2de634a6
--- /dev/null
+++ b/data/cities/clarksville/virginia-avenue-mall.yml
@@ -0,0 +1,11 @@
+id: 2601547650
+type: node
+latitude: 36.62507
+longitude: -78.55565
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "317"
+phone: +1-434-374-5949
+opening_hours: Mo-Th 09:30-17:00; Fr-Sa 09:30-19:00; Su 11:00-17:00
+website: ""
diff --git a/data/cities/clarksville/watkins-cooper-lyon-funeral-home.yml b/data/cities/clarksville/watkins-cooper-lyon-funeral-home.yml
new file mode 100644
index 000000000..2b048dfec
--- /dev/null
+++ b/data/cities/clarksville/watkins-cooper-lyon-funeral-home.yml
@@ -0,0 +1,11 @@
+id: 12405948851
+type: node
+latitude: 36.6218
+longitude: -78.56017
+postcode: "23927"
+city: Clarksville
+street: Virginia Avenue
+housenumber: "703"
+phone: +1-434-374-8258
+opening_hours: ""
+website: https://www.brookslyon.com/
diff --git a/data/cities/dublin/ace-hardware-cleburne-boulevard.yml b/data/cities/dublin/ace-hardware-cleburne-boulevard.yml
new file mode 100644
index 000000000..67583b958
--- /dev/null
+++ b/data/cities/dublin/ace-hardware-cleburne-boulevard.yml
@@ -0,0 +1,11 @@
+id: 1341803817
+type: node
+latitude: 37.08625
+longitude: -80.69
+postcode: "24084"
+city: Dublin
+street: Cleburne Boulevard
+housenumber: "4697"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/ace-hardware.yml b/data/cities/dublin/ace-hardware.yml
index b32b46613..8db622ab7 100644
--- a/data/cities/dublin/ace-hardware.yml
+++ b/data/cities/dublin/ace-hardware.yml
@@ -1,7 +1,7 @@
 id: 11137308403
 type: node
-latitude: 37.08608
-longitude: -80.69007
+latitude: 37.08596
+longitude: -80.68985
 postcode: 24084-4415
 city: Dublin
 street: Cleburne Boulevard
diff --git a/data/cities/dublin/dollar-general.yml b/data/cities/dublin/dollar-general.yml
new file mode 100644
index 000000000..07dfefa8d
--- /dev/null
+++ b/data/cities/dublin/dollar-general.yml
@@ -0,0 +1,11 @@
+id: 1341803822
+type: node
+latitude: 37.09622
+longitude: -80.69093
+postcode: "24084"
+city: Dublin
+street: Dominion Drive
+housenumber: "101"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/dollar-tree.yml b/data/cities/dublin/dollar-tree.yml
new file mode 100644
index 000000000..1f11da060
--- /dev/null
+++ b/data/cities/dublin/dollar-tree.yml
@@ -0,0 +1,11 @@
+id: 1341803818
+type: node
+latitude: 37.09031
+longitude: -80.68903
+postcode: "24084"
+city: Dublin
+street: Cleburne Boulevard
+housenumber: "4801"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/maria-bonita-tienda-mexicana.yml b/data/cities/dublin/maria-bonita-tienda-mexicana.yml
new file mode 100644
index 000000000..b252d7850
--- /dev/null
+++ b/data/cities/dublin/maria-bonita-tienda-mexicana.yml
@@ -0,0 +1,11 @@
+id: 12207024884
+type: node
+latitude: 37.08212
+longitude: -80.69424
+postcode: "24084"
+city: Dublin
+street: Alexander Road
+housenumber: "5243"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/oreilly-auto-parts.yml b/data/cities/dublin/oreilly-auto-parts.yml
new file mode 100644
index 000000000..9cbc3b2c5
--- /dev/null
+++ b/data/cities/dublin/oreilly-auto-parts.yml
@@ -0,0 +1,11 @@
+id: 1341803816
+type: node
+latitude: 37.08551
+longitude: -80.68901
+postcode: "24084"
+city: Dublin
+street: Harvest Place
+housenumber: "4651"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/shop-eez.yml b/data/cities/dublin/shop-eez.yml
new file mode 100644
index 000000000..ba87afa79
--- /dev/null
+++ b/data/cities/dublin/shop-eez.yml
@@ -0,0 +1,11 @@
+id: 1341803820
+type: node
+latitude: 37.09258
+longitude: -80.68829
+postcode: "24084"
+city: Dublin
+street: Cleburne Boulevard
+housenumber: "4681"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/top-shelf-nail-service.yml b/data/cities/dublin/top-shelf-nail-service.yml
new file mode 100644
index 000000000..a68064f29
--- /dev/null
+++ b/data/cities/dublin/top-shelf-nail-service.yml
@@ -0,0 +1,11 @@
+id: 12207024883
+type: node
+latitude: 37.08205
+longitude: -80.69411
+postcode: "24084"
+city: Dublin
+street: Alexander Road
+housenumber: "5251"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/verizon.yml b/data/cities/dublin/verizon.yml
new file mode 100644
index 000000000..b80ae5cb1
--- /dev/null
+++ b/data/cities/dublin/verizon.yml
@@ -0,0 +1,11 @@
+id: 12207024881
+type: node
+latitude: 37.08197
+longitude: -80.69396
+postcode: "24084"
+city: Dublin
+street: Alexander Road
+housenumber: "5259"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/dublin/virginia-abc.yml b/data/cities/dublin/virginia-abc.yml
new file mode 100644
index 000000000..407cecc78
--- /dev/null
+++ b/data/cities/dublin/virginia-abc.yml
@@ -0,0 +1,11 @@
+id: 12207024879
+type: node
+latitude: 37.08186
+longitude: -80.69375
+postcode: "24084"
+city: Dublin
+street: Alexander Road
+housenumber: "5265"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/falls-church/old-brick-house-square.yml b/data/cities/falls-church/old-brick-house-square.yml
new file mode 100644
index 000000000..6eacc639a
--- /dev/null
+++ b/data/cities/falls-church/old-brick-house-square.yml
@@ -0,0 +1,11 @@
+id: 439089790
+type: node
+latitude: 38.88993
+longitude: -77.18364
+postcode: "22046"
+city: Falls Church
+street: Rowell Court
+housenumber: "107"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/fredericksburg/firestone-patriot-highway.yml b/data/cities/fredericksburg/firestone-patriot-highway.yml
new file mode 100644
index 000000000..b34f62f33
--- /dev/null
+++ b/data/cities/fredericksburg/firestone-patriot-highway.yml
@@ -0,0 +1,11 @@
+id: 547935329
+type: node
+latitude: 38.21929
+longitude: -77.50843
+postcode: "22407"
+city: Fredericksburg
+street: Patriot Highway
+housenumber: "9600"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/fredericksburg/firestone-plank-road.yml b/data/cities/fredericksburg/firestone-plank-road.yml
deleted file mode 100644
index be0b8163e..000000000
--- a/data/cities/fredericksburg/firestone-plank-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 457502944
-type: node
-latitude: 38.29241
-longitude: -77.56366
-postcode: 22407-6638
-city: Fredericksburg
-street: Plank Road
-housenumber: "5527"
-phone: ""
-opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00; Su 07:00-17:00
-website: ""
diff --git a/data/cities/fredericksburg/firestone.yml b/data/cities/fredericksburg/firestone.yml
index b34f62f33..be0b8163e 100644
--- a/data/cities/fredericksburg/firestone.yml
+++ b/data/cities/fredericksburg/firestone.yml
@@ -1,11 +1,11 @@
-id: 547935329
+id: 457502944
 type: node
-latitude: 38.21929
-longitude: -77.50843
-postcode: "22407"
+latitude: 38.29241
+longitude: -77.56366
+postcode: 22407-6638
 city: Fredericksburg
-street: Patriot Highway
-housenumber: "9600"
+street: Plank Road
+housenumber: "5527"
 phone: ""
-opening_hours: ""
+opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00; Su 07:00-17:00
 website: ""
diff --git a/data/cities/front-royal/speedway-north-shenandoah-avenue.yml b/data/cities/front-royal/speedway-north-shenandoah-avenue.yml
deleted file mode 100644
index 5243c1cfe..000000000
--- a/data/cities/front-royal/speedway-north-shenandoah-avenue.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9263353778
-type: node
-latitude: 38.93752
-longitude: -78.19967
-postcode: "22630"
-city: Front Royal
-street: North Shenandoah Avenue
-housenumber: "1710"
-phone: +1-540-636-3220
-opening_hours: 24/7
-website: https://www.speedway.com/locations/VA/Front-Royal/1710-North-Shenandoah-Ave
diff --git a/data/cities/front-royal/speedway-south-commerce-avenue.yml b/data/cities/front-royal/speedway-south-commerce-avenue.yml
new file mode 100644
index 000000000..3f7306e33
--- /dev/null
+++ b/data/cities/front-royal/speedway-south-commerce-avenue.yml
@@ -0,0 +1,11 @@
+id: 9265088912
+type: node
+latitude: 38.91196
+longitude: -78.18412
+postcode: "22630"
+city: Front Royal
+street: South Commerce Avenue
+housenumber: "416"
+phone: +1-540-635-6901
+opening_hours: 24/7
+website: https://www.speedway.com/locations/VA/Front-Royal/416-South-Commerce-Ave
diff --git a/data/cities/front-royal/speedway.yml b/data/cities/front-royal/speedway.yml
index 3f7306e33..5243c1cfe 100644
--- a/data/cities/front-royal/speedway.yml
+++ b/data/cities/front-royal/speedway.yml
@@ -1,11 +1,11 @@
-id: 9265088912
+id: 9263353778
 type: node
-latitude: 38.91196
-longitude: -78.18412
+latitude: 38.93752
+longitude: -78.19967
 postcode: "22630"
 city: Front Royal
-street: South Commerce Avenue
-housenumber: "416"
-phone: +1-540-635-6901
+street: North Shenandoah Avenue
+housenumber: "1710"
+phone: +1-540-636-3220
 opening_hours: 24/7
-website: https://www.speedway.com/locations/VA/Front-Royal/416-South-Commerce-Ave
+website: https://www.speedway.com/locations/VA/Front-Royal/1710-North-Shenandoah-Ave
diff --git a/data/cities/gainesville/la-z-boy.yml b/data/cities/gainesville/la-z-boy.yml
index 9721906b9..2396e6538 100644
--- a/data/cities/gainesville/la-z-boy.yml
+++ b/data/cities/gainesville/la-z-boy.yml
@@ -1,7 +1,7 @@
 id: 45566371
 type: node
-latitude: 38.79655
-longitude: -77.60779
+latitude: 38.79656
+longitude: -77.60782
 postcode: "20155"
 city: Gainesville
 street: Atlas Walk Way
diff --git a/data/cities/gainesville/ulta-beauty.yml b/data/cities/gainesville/ulta-beauty.yml
index 005ae1e44..057b2bfce 100644
--- a/data/cities/gainesville/ulta-beauty.yml
+++ b/data/cities/gainesville/ulta-beauty.yml
@@ -1,7 +1,7 @@
 id: 2311206362
 type: node
-latitude: 38.79478
-longitude: -77.60561
+latitude: 38.79488
+longitude: -77.6056
 postcode: "20155"
 city: Gainesville
 street: Gateway Center Drive
diff --git a/data/cities/hampton/7-eleven-north-king-street-2.yml b/data/cities/hampton/7-eleven-north-king-street-2.yml
index 4e1d1ed6d..2200280ef 100644
--- a/data/cities/hampton/7-eleven-north-king-street-2.yml
+++ b/data/cities/hampton/7-eleven-north-king-street-2.yml
@@ -1,11 +1,11 @@
-id: 388465086
+id: 388482252
 type: node
-latitude: 37.0453
-longitude: -76.3475
+latitude: 37.03931
+longitude: -76.34874
 postcode: "23669"
 city: Hampton
 street: North King Street
-housenumber: "1200"
+housenumber: "989"
 phone: ""
-opening_hours: 24/7
+opening_hours: ""
 website: ""
diff --git a/data/cities/hampton/7-eleven-north-king-street.yml b/data/cities/hampton/7-eleven-north-king-street.yml
index 2200280ef..4e1d1ed6d 100644
--- a/data/cities/hampton/7-eleven-north-king-street.yml
+++ b/data/cities/hampton/7-eleven-north-king-street.yml
@@ -1,11 +1,11 @@
-id: 388482252
+id: 388465086
 type: node
-latitude: 37.03931
-longitude: -76.34874
+latitude: 37.0453
+longitude: -76.3475
 postcode: "23669"
 city: Hampton
 street: North King Street
-housenumber: "989"
+housenumber: "1200"
 phone: ""
-opening_hours: ""
+opening_hours: 24/7
 website: ""
diff --git a/data/cities/hampton/extra-space-storage-cunningham-drive.yml b/data/cities/hampton/extra-space-storage-cunningham-drive.yml
deleted file mode 100644
index d4ea5d8d3..000000000
--- a/data/cities/hampton/extra-space-storage-cunningham-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 388598297
-type: node
-latitude: 37.04178
-longitude: -76.38098
-postcode: "23666"
-city: Hampton
-street: Cunningham Drive
-housenumber: "1975"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/hampton/extra-space-storage-lasalle-avenue.yml b/data/cities/hampton/extra-space-storage-lasalle-avenue.yml
new file mode 100644
index 000000000..95b4e828e
--- /dev/null
+++ b/data/cities/hampton/extra-space-storage-lasalle-avenue.yml
@@ -0,0 +1,11 @@
+id: 388516365
+type: node
+latitude: 37.02433
+longitude: -76.36477
+postcode: "23661"
+city: Hampton
+street: Lasalle Avenue
+housenumber: "815"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/hampton/extra-space-storage.yml b/data/cities/hampton/extra-space-storage.yml
index 95b4e828e..d4ea5d8d3 100644
--- a/data/cities/hampton/extra-space-storage.yml
+++ b/data/cities/hampton/extra-space-storage.yml
@@ -1,11 +1,11 @@
-id: 388516365
+id: 388598297
 type: node
-latitude: 37.02433
-longitude: -76.36477
-postcode: "23661"
+latitude: 37.04178
+longitude: -76.38098
+postcode: "23666"
 city: Hampton
-street: Lasalle Avenue
-housenumber: "815"
+street: Cunningham Drive
+housenumber: "1975"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/hampton/farm-fresh.yml b/data/cities/hampton/food-lion-east-mercury-boulevard.yml
similarity index 73%
rename from data/cities/hampton/farm-fresh.yml
rename to data/cities/hampton/food-lion-east-mercury-boulevard.yml
index b06ec906a..e6f610419 100644
--- a/data/cities/hampton/farm-fresh.yml
+++ b/data/cities/hampton/food-lion-east-mercury-boulevard.yml
@@ -6,6 +6,6 @@ postcode: "23663"
 city: Hampton
 street: East Mercury Boulevard
 housenumber: "608"
-phone: ""
-opening_hours: ""
+phone: +1-757-723-0771
+opening_hours: Mo-Su 07:00-23:00
 website: ""
diff --git a/data/cities/harrisonburg/family-dollar-chicago-avenue.yml b/data/cities/harrisonburg/family-dollar-chicago-avenue.yml
new file mode 100644
index 000000000..8f70b7c3b
--- /dev/null
+++ b/data/cities/harrisonburg/family-dollar-chicago-avenue.yml
@@ -0,0 +1,11 @@
+id: 677299930
+type: node
+latitude: 38.45991
+longitude: -78.87487
+postcode: 22802-5606
+city: Harrisonburg
+street: Chicago Avenue
+housenumber: "813"
+phone: +1 540-282-6313
+opening_hours: Mo-Sa 09:00-22:00; Su 09:00-21:00
+website: https://www.familydollar.com/locations/va/harrisonburg/30858/
diff --git a/data/cities/harrisonburg/family-dollar-south-main-street.yml b/data/cities/harrisonburg/family-dollar-south-main-street.yml
deleted file mode 100644
index 7fd701194..000000000
--- a/data/cities/harrisonburg/family-dollar-south-main-street.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 588710699
-type: node
-latitude: 38.43284
-longitude: -78.88195
-postcode: 22801-2911
-city: Harrisonburg
-street: South Main Street
-housenumber: "1420"
-phone: +1 540-282-6641
-opening_hours: Mo-Sa 09:00-22:00; Su 09:00-21:00
-website: https://www.familydollar.com/locations/va/harrisonburg/25264/
diff --git a/data/cities/harrisonburg/family-dollar.yml b/data/cities/harrisonburg/family-dollar.yml
index 8f70b7c3b..7fd701194 100644
--- a/data/cities/harrisonburg/family-dollar.yml
+++ b/data/cities/harrisonburg/family-dollar.yml
@@ -1,11 +1,11 @@
-id: 677299930
+id: 588710699
 type: node
-latitude: 38.45991
-longitude: -78.87487
-postcode: 22802-5606
+latitude: 38.43284
+longitude: -78.88195
+postcode: 22801-2911
 city: Harrisonburg
-street: Chicago Avenue
-housenumber: "813"
-phone: +1 540-282-6313
+street: South Main Street
+housenumber: "1420"
+phone: +1 540-282-6641
 opening_hours: Mo-Sa 09:00-22:00; Su 09:00-21:00
-website: https://www.familydollar.com/locations/va/harrisonburg/30858/
+website: https://www.familydollar.com/locations/va/harrisonburg/25264/
diff --git a/data/cities/henrico/publix-john-rolfe-parkway.yml b/data/cities/henrico/publix-john-rolfe-parkway.yml
deleted file mode 100644
index f9a36dc66..000000000
--- a/data/cities/henrico/publix-john-rolfe-parkway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 304253139
-type: node
-latitude: 37.6229
-longitude: -77.62434
-postcode: 23233-6913
-city: Henrico
-street: John Rolfe Parkway
-housenumber: "2250"
-phone: +1 804-360-4920
-opening_hours: Mo-Su 07:00-22:00
-website: https://www.publix.com/locations/1590
diff --git a/data/cities/henrico/publix-pump-road.yml b/data/cities/henrico/publix-pump-road.yml
new file mode 100644
index 000000000..e9ba96318
--- /dev/null
+++ b/data/cities/henrico/publix-pump-road.yml
@@ -0,0 +1,11 @@
+id: 225757979
+type: node
+latitude: 37.64927
+longitude: -77.61534
+postcode: 23233-1111
+city: Henrico
+street: Pump Road
+housenumber: "3460"
+phone: +1 804-364-6314
+opening_hours: Mo-Su 07:00-21:00
+website: https://www.publix.com/locations/1587
diff --git a/data/cities/henrico/publix.yml b/data/cities/henrico/publix.yml
index e9ba96318..f9a36dc66 100644
--- a/data/cities/henrico/publix.yml
+++ b/data/cities/henrico/publix.yml
@@ -1,11 +1,11 @@
-id: 225757979
+id: 304253139
 type: node
-latitude: 37.64927
-longitude: -77.61534
-postcode: 23233-1111
+latitude: 37.6229
+longitude: -77.62434
+postcode: 23233-6913
 city: Henrico
-street: Pump Road
-housenumber: "3460"
-phone: +1 804-364-6314
-opening_hours: Mo-Su 07:00-21:00
-website: https://www.publix.com/locations/1587
+street: John Rolfe Parkway
+housenumber: "2250"
+phone: +1 804-360-4920
+opening_hours: Mo-Su 07:00-22:00
+website: https://www.publix.com/locations/1590
diff --git a/data/cities/james-city-county/7-eleven-merrimac-trail.yml b/data/cities/james-city-county/7-eleven-merrimac-trail.yml
deleted file mode 100644
index 8b43f7f59..000000000
--- a/data/cities/james-city-county/7-eleven-merrimac-trail.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 370270961
-type: node
-latitude: 37.26527
-longitude: -76.6741
-postcode: "23185"
-city: James City County
-street: Merrimac Trail
-housenumber: "7114"
-phone: +1 757-229-6483
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/williamsburg/7114-merrimac-trail-10850
diff --git a/data/cities/james-city-county/7-eleven-richmond-road.yml b/data/cities/james-city-county/7-eleven-richmond-road.yml
new file mode 100644
index 000000000..5aa1d5106
--- /dev/null
+++ b/data/cities/james-city-county/7-eleven-richmond-road.yml
@@ -0,0 +1,11 @@
+id: 370437427
+type: node
+latitude: 37.34575
+longitude: -76.7578
+postcode: "23188"
+city: James City County
+street: Richmond Road
+housenumber: "6658"
+phone: +1 757-565-3225
+opening_hours: ""
+website: https://www.7-eleven.com/locations/va/williamsburg/6658-richmond-rd-26407
diff --git a/data/cities/james-city-county/7-eleven.yml b/data/cities/james-city-county/7-eleven.yml
index 5aa1d5106..8b43f7f59 100644
--- a/data/cities/james-city-county/7-eleven.yml
+++ b/data/cities/james-city-county/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 370437427
+id: 370270961
 type: node
-latitude: 37.34575
-longitude: -76.7578
-postcode: "23188"
+latitude: 37.26527
+longitude: -76.6741
+postcode: "23185"
 city: James City County
-street: Richmond Road
-housenumber: "6658"
-phone: +1 757-565-3225
+street: Merrimac Trail
+housenumber: "7114"
+phone: +1 757-229-6483
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/williamsburg/6658-richmond-rd-26407
+website: https://www.7-eleven.com/locations/va/williamsburg/7114-merrimac-trail-10850
diff --git a/data/cities/lexington/cocoa-mill-chocolate-company.yml b/data/cities/lexington/cocoa-mill-chocolate-company.yml
deleted file mode 100644
index 0fcda51d9..000000000
--- a/data/cities/lexington/cocoa-mill-chocolate-company.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3040125079
-type: node
-latitude: 37.78523
-longitude: -79.44426
-postcode: "24450"
-city: Lexington
-street: West Nelson Street
-housenumber: "123"
-phone: +1-540-464-8400
-opening_hours: Mo-Sa 10:00-17:00
-website: https://cocoamill.com/
diff --git a/data/cities/manassas/mattress-firm-liberia-avenue-2.yml b/data/cities/manassas/mattress-firm-liberia-avenue-2.yml
new file mode 100644
index 000000000..83c3f4183
--- /dev/null
+++ b/data/cities/manassas/mattress-firm-liberia-avenue-2.yml
@@ -0,0 +1,11 @@
+id: 5326418621
+type: node
+latitude: 38.74295
+longitude: -77.45237
+postcode: "20110"
+city: Manassas
+street: Liberia Avenue
+housenumber: "9936"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/manassas/mattress-firm-liberia-avenue.yml b/data/cities/manassas/mattress-firm-liberia-avenue.yml
index 83c3f4183..318517faa 100644
--- a/data/cities/manassas/mattress-firm-liberia-avenue.yml
+++ b/data/cities/manassas/mattress-firm-liberia-avenue.yml
@@ -1,11 +1,11 @@
-id: 5326418621
+id: 2320260531
 type: node
-latitude: 38.74295
-longitude: -77.45237
+latitude: 38.74277
+longitude: -77.45251
 postcode: "20110"
 city: Manassas
 street: Liberia Avenue
 housenumber: "9936"
-phone: ""
+phone: +1 703-257-2867
 opening_hours: ""
-website: ""
+website: https://www.mattressfirm.com/en-us/stores/va/manassas/179035/
diff --git a/data/cities/manassas/mattress-firm-sowder-village-square.yml b/data/cities/manassas/mattress-firm-sowder-village-square.yml
deleted file mode 100644
index 7a70cbc41..000000000
--- a/data/cities/manassas/mattress-firm-sowder-village-square.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2315104020
-type: node
-latitude: 38.73936
-longitude: -77.53416
-postcode: "20109"
-city: Manassas
-street: Sowder Village Square
-housenumber: "9950"
-phone: +1 703-361-1713
-opening_hours: Mo-Sa 10:00-20:00; Su 10:00-18:00
-website: https://www.mattressfirm.com/en-us/stores/va/manassas/179050/
diff --git a/data/cities/manassas/mattress-firm.yml b/data/cities/manassas/mattress-firm.yml
index 318517faa..7a70cbc41 100644
--- a/data/cities/manassas/mattress-firm.yml
+++ b/data/cities/manassas/mattress-firm.yml
@@ -1,11 +1,11 @@
-id: 2320260531
+id: 2315104020
 type: node
-latitude: 38.74277
-longitude: -77.45251
-postcode: "20110"
+latitude: 38.73936
+longitude: -77.53416
+postcode: "20109"
 city: Manassas
-street: Liberia Avenue
-housenumber: "9936"
-phone: +1 703-257-2867
-opening_hours: ""
-website: https://www.mattressfirm.com/en-us/stores/va/manassas/179035/
+street: Sowder Village Square
+housenumber: "9950"
+phone: +1 703-361-1713
+opening_hours: Mo-Sa 10:00-20:00; Su 10:00-18:00
+website: https://www.mattressfirm.com/en-us/stores/va/manassas/179050/
diff --git a/data/cities/midlothian/kroger-midlothian-turnpike.yml b/data/cities/midlothian/kroger-midlothian-turnpike.yml
new file mode 100644
index 000000000..e41cdd31a
--- /dev/null
+++ b/data/cities/midlothian/kroger-midlothian-turnpike.yml
@@ -0,0 +1,11 @@
+id: 231159580
+type: node
+latitude: 37.50485
+longitude: -77.66427
+postcode: "23114"
+city: Midlothian
+street: Midlothian Turnpike
+housenumber: "14241"
+phone: +1 804-594-1645
+opening_hours: Mo-Su 06:00-23:00
+website: https://www.kroger.com/stores/grocery/va/midlothian/midlothian/029/00523
diff --git a/data/cities/midlothian/kroger-rittenhouse-drive.yml b/data/cities/midlothian/kroger-rittenhouse-drive.yml
deleted file mode 100644
index 9726a10d7..000000000
--- a/data/cities/midlothian/kroger-rittenhouse-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 235645421
-type: node
-latitude: 37.41529
-longitude: -77.63941
-postcode: "23112"
-city: Midlothian
-street: Rittenhouse Drive
-housenumber: "13201"
-phone: +1 804-763-5403
-opening_hours: Mo-Fr 08:00-20:00;Sa 09:00-18:00;Su 10:00-17:00
-website: https://www.kroger.com/stores/grocery/va/midlothian/swift-creek/029/00512
diff --git a/data/cities/midlothian/kroger.yml b/data/cities/midlothian/kroger.yml
index e41cdd31a..9726a10d7 100644
--- a/data/cities/midlothian/kroger.yml
+++ b/data/cities/midlothian/kroger.yml
@@ -1,11 +1,11 @@
-id: 231159580
+id: 235645421
 type: node
-latitude: 37.50485
-longitude: -77.66427
-postcode: "23114"
+latitude: 37.41529
+longitude: -77.63941
+postcode: "23112"
 city: Midlothian
-street: Midlothian Turnpike
-housenumber: "14241"
-phone: +1 804-594-1645
-opening_hours: Mo-Su 06:00-23:00
-website: https://www.kroger.com/stores/grocery/va/midlothian/midlothian/029/00523
+street: Rittenhouse Drive
+housenumber: "13201"
+phone: +1 804-763-5403
+opening_hours: Mo-Fr 08:00-20:00;Sa 09:00-18:00;Su 10:00-17:00
+website: https://www.kroger.com/stores/grocery/va/midlothian/swift-creek/029/00512
diff --git a/data/cities/midlothian/wawa-pike-view-drive.yml b/data/cities/midlothian/wawa-pike-view-drive.yml
new file mode 100644
index 000000000..89fb21a44
--- /dev/null
+++ b/data/cities/midlothian/wawa-pike-view-drive.yml
@@ -0,0 +1,11 @@
+id: 298693153
+type: node
+latitude: 37.51319
+longitude: -77.69877
+postcode: "23113"
+city: Midlothian
+street: Pike View Drive
+housenumber: "150"
+phone: +1 804-794-4518
+opening_hours: 24/7
+website: https://www.wawa.com/locations/8623
diff --git a/data/cities/midlothian/wawa-southshore-pointe-drive.yml b/data/cities/midlothian/wawa-southshore-pointe-drive.yml
deleted file mode 100644
index 7a2258276..000000000
--- a/data/cities/midlothian/wawa-southshore-pointe-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 235696176
-type: node
-latitude: 37.40519
-longitude: -77.665
-postcode: "23112"
-city: Midlothian
-street: Southshore Pointe Drive
-housenumber: "12001"
-phone: ""
-opening_hours: 24/7
-website: https://www.wawa.com/locations/657
diff --git a/data/cities/midlothian/wawa.yml b/data/cities/midlothian/wawa.yml
index 89fb21a44..7a2258276 100644
--- a/data/cities/midlothian/wawa.yml
+++ b/data/cities/midlothian/wawa.yml
@@ -1,11 +1,11 @@
-id: 298693153
+id: 235696176
 type: node
-latitude: 37.51319
-longitude: -77.69877
-postcode: "23113"
+latitude: 37.40519
+longitude: -77.665
+postcode: "23112"
 city: Midlothian
-street: Pike View Drive
-housenumber: "150"
-phone: +1 804-794-4518
+street: Southshore Pointe Drive
+housenumber: "12001"
+phone: ""
 opening_hours: 24/7
-website: https://www.wawa.com/locations/8623
+website: https://www.wawa.com/locations/657
diff --git a/data/cities/newport-news/7-eleven-jefferson-avenue-2.yml b/data/cities/newport-news/7-eleven-jefferson-avenue-2.yml
index 93a26a066..e5e5cf166 100644
--- a/data/cities/newport-news/7-eleven-jefferson-avenue-2.yml
+++ b/data/cities/newport-news/7-eleven-jefferson-avenue-2.yml
@@ -1,11 +1,11 @@
-id: 332977260
+id: 332977064
 type: node
-latitude: 37.06055
-longitude: -76.46549
+latitude: 37.07002
+longitude: -76.47151
 postcode: "23601"
 city: Newport News
 street: Jefferson Avenue
-housenumber: "11202"
-phone: +1 757-298-8227
+housenumber: "11504"
+phone: ""
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/newport-news/11202-jefferson-ave-41994
+website: ""
diff --git a/data/cities/newport-news/7-eleven-jefferson-avenue-3.yml b/data/cities/newport-news/7-eleven-jefferson-avenue-3.yml
index 9908e81e2..93a26a066 100644
--- a/data/cities/newport-news/7-eleven-jefferson-avenue-3.yml
+++ b/data/cities/newport-news/7-eleven-jefferson-avenue-3.yml
@@ -1,11 +1,11 @@
-id: 319721956
+id: 332977260
 type: node
-latitude: 37.1
-longitude: -76.49163
-postcode: "23606"
+latitude: 37.06055
+longitude: -76.46549
+postcode: "23601"
 city: Newport News
 street: Jefferson Avenue
-housenumber: "12089"
-phone: +1 757-249-0237
+housenumber: "11202"
+phone: +1 757-298-8227
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/newport-news/12089-jefferson-ave-39750
+website: https://www.7-eleven.com/locations/va/newport-news/11202-jefferson-ave-41994
diff --git a/data/cities/newport-news/7-eleven-jefferson-avenue-4.yml b/data/cities/newport-news/7-eleven-jefferson-avenue-4.yml
index b9ff8066d..7d0c04eab 100644
--- a/data/cities/newport-news/7-eleven-jefferson-avenue-4.yml
+++ b/data/cities/newport-news/7-eleven-jefferson-avenue-4.yml
@@ -1,11 +1,11 @@
-id: 333184958
+id: 333278190
 type: node
-latitude: 37.20804
-longitude: -76.5737
-postcode: "23603"
+latitude: 37.01367
+longitude: -76.44025
+postcode: "23605"
 city: Newport News
 street: Jefferson Avenue
-housenumber: "14500"
-phone: ""
+housenumber: "5988"
+phone: +1 757-247-0545
 opening_hours: ""
-website: ""
+website: https://www.7-eleven.com/locations/va/newport-news/5988-jefferson-ave-20445
diff --git a/data/cities/newport-news/7-eleven-jefferson-avenue-5.yml b/data/cities/newport-news/7-eleven-jefferson-avenue-5.yml
index 7d0c04eab..b9ff8066d 100644
--- a/data/cities/newport-news/7-eleven-jefferson-avenue-5.yml
+++ b/data/cities/newport-news/7-eleven-jefferson-avenue-5.yml
@@ -1,11 +1,11 @@
-id: 333278190
+id: 333184958
 type: node
-latitude: 37.01367
-longitude: -76.44025
-postcode: "23605"
+latitude: 37.20804
+longitude: -76.5737
+postcode: "23603"
 city: Newport News
 street: Jefferson Avenue
-housenumber: "5988"
-phone: +1 757-247-0545
+housenumber: "14500"
+phone: ""
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/newport-news/5988-jefferson-ave-20445
+website: ""
diff --git a/data/cities/newport-news/7-eleven-jefferson-avenue.yml b/data/cities/newport-news/7-eleven-jefferson-avenue.yml
index e5e5cf166..9908e81e2 100644
--- a/data/cities/newport-news/7-eleven-jefferson-avenue.yml
+++ b/data/cities/newport-news/7-eleven-jefferson-avenue.yml
@@ -1,11 +1,11 @@
-id: 332977064
+id: 319721956
 type: node
-latitude: 37.07002
-longitude: -76.47151
-postcode: "23601"
+latitude: 37.1
+longitude: -76.49163
+postcode: "23606"
 city: Newport News
 street: Jefferson Avenue
-housenumber: "11504"
-phone: ""
+housenumber: "12089"
+phone: +1 757-249-0237
 opening_hours: ""
-website: ""
+website: https://www.7-eleven.com/locations/va/newport-news/12089-jefferson-ave-39750
diff --git a/data/cities/newport-news/7-eleven-warwick-boulevard-2.yml b/data/cities/newport-news/7-eleven-warwick-boulevard-2.yml
index 467348256..1ea72c740 100644
--- a/data/cities/newport-news/7-eleven-warwick-boulevard-2.yml
+++ b/data/cities/newport-news/7-eleven-warwick-boulevard-2.yml
@@ -1,11 +1,11 @@
-id: 333182488
+id: 333117020
 type: node
-latitude: 37.02975
-longitude: -76.45826
-postcode: "23601"
+latitude: 37.17671
+longitude: -76.56937
+postcode: "23603"
 city: Newport News
 street: Warwick Boulevard
-housenumber: "10185"
-phone: +1 757-596-9441
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/newport-news/10185-warwick-blvd-10831
+housenumber: "16960"
+phone: +1 757-887-1700
+opening_hours: 24/7
+website: https://www.7-eleven.com/locations/va/newport-news/16930-warwick-blvd-18683
diff --git a/data/cities/newport-news/7-eleven-warwick-boulevard-3.yml b/data/cities/newport-news/7-eleven-warwick-boulevard-3.yml
index 11f372c4e..2537c8fa5 100644
--- a/data/cities/newport-news/7-eleven-warwick-boulevard-3.yml
+++ b/data/cities/newport-news/7-eleven-warwick-boulevard-3.yml
@@ -1,11 +1,11 @@
-id: 333001698
+id: 333148322
 type: node
-latitude: 37.01081
-longitude: -76.44674
-postcode: "23607"
+latitude: 37.11417
+longitude: -76.52013
+postcode: "23602"
 city: Newport News
 street: Warwick Boulevard
-housenumber: "7101"
-phone: +1 757-806-6255
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/newport-news/7101-warwick-boulevard-10863
+housenumber: "13307"
+phone: 757-874-1638
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/newport-news/7-eleven-warwick-boulevard-4.yml b/data/cities/newport-news/7-eleven-warwick-boulevard-4.yml
index 1ea72c740..11f372c4e 100644
--- a/data/cities/newport-news/7-eleven-warwick-boulevard-4.yml
+++ b/data/cities/newport-news/7-eleven-warwick-boulevard-4.yml
@@ -1,11 +1,11 @@
-id: 333117020
+id: 333001698
 type: node
-latitude: 37.17671
-longitude: -76.56937
-postcode: "23603"
+latitude: 37.01081
+longitude: -76.44674
+postcode: "23607"
 city: Newport News
 street: Warwick Boulevard
-housenumber: "16960"
-phone: +1 757-887-1700
-opening_hours: 24/7
-website: https://www.7-eleven.com/locations/va/newport-news/16930-warwick-blvd-18683
+housenumber: "7101"
+phone: +1 757-806-6255
+opening_hours: ""
+website: https://www.7-eleven.com/locations/va/newport-news/7101-warwick-boulevard-10863
diff --git a/data/cities/newport-news/7-eleven-warwick-boulevard-5.yml b/data/cities/newport-news/7-eleven-warwick-boulevard-5.yml
index 25c72231a..467348256 100644
--- a/data/cities/newport-news/7-eleven-warwick-boulevard-5.yml
+++ b/data/cities/newport-news/7-eleven-warwick-boulevard-5.yml
@@ -1,11 +1,11 @@
-id: 332775860
+id: 333182488
 type: node
-latitude: 37.07253
-longitude: -76.49263
-postcode: "23606"
+latitude: 37.02975
+longitude: -76.45826
+postcode: "23601"
 city: Newport News
 street: Warwick Boulevard
-housenumber: "12460"
-phone: ""
+housenumber: "10185"
+phone: +1 757-596-9441
 opening_hours: ""
-website: ""
+website: https://www.7-eleven.com/locations/va/newport-news/10185-warwick-blvd-10831
diff --git a/data/cities/newport-news/7-eleven-warwick-boulevard-6.yml b/data/cities/newport-news/7-eleven-warwick-boulevard-6.yml
index 2537c8fa5..25c72231a 100644
--- a/data/cities/newport-news/7-eleven-warwick-boulevard-6.yml
+++ b/data/cities/newport-news/7-eleven-warwick-boulevard-6.yml
@@ -1,11 +1,11 @@
-id: 333148322
+id: 332775860
 type: node
-latitude: 37.11417
-longitude: -76.52013
-postcode: "23602"
+latitude: 37.07253
+longitude: -76.49263
+postcode: "23606"
 city: Newport News
 street: Warwick Boulevard
-housenumber: "13307"
-phone: 757-874-1638
-opening_hours: 24/7
+housenumber: "12460"
+phone: ""
+opening_hours: ""
 website: ""
diff --git a/data/cities/newport-news/firestone-warwick-boulevard.yml b/data/cities/newport-news/firestone-warwick-boulevard.yml
index fbae2addb..76deb08b8 100644
--- a/data/cities/newport-news/firestone-warwick-boulevard.yml
+++ b/data/cities/newport-news/firestone-warwick-boulevard.yml
@@ -1,11 +1,11 @@
-id: 332972845
+id: 333242349
 type: node
-latitude: 37.07121
-longitude: -76.49356
-postcode: "23606"
+latitude: 37.1262
+longitude: -76.53401
+postcode: "23602"
 city: Newport News
 street: Warwick Boulevard
-housenumber: "12435"
-phone: ""
-opening_hours: ""
+housenumber: "13815"
+phone: 757-320-5220
+opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00; Su 09:00-17:00
 website: ""
diff --git a/data/cities/newport-news/firestone.yml b/data/cities/newport-news/firestone.yml
index 76deb08b8..fbae2addb 100644
--- a/data/cities/newport-news/firestone.yml
+++ b/data/cities/newport-news/firestone.yml
@@ -1,11 +1,11 @@
-id: 333242349
+id: 332972845
 type: node
-latitude: 37.1262
-longitude: -76.53401
-postcode: "23602"
+latitude: 37.07121
+longitude: -76.49356
+postcode: "23606"
 city: Newport News
 street: Warwick Boulevard
-housenumber: "13815"
-phone: 757-320-5220
-opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00; Su 09:00-17:00
+housenumber: "12435"
+phone: ""
+opening_hours: ""
 website: ""
diff --git a/data/cities/newport-news/t-mobile-jefferson-avenue.yml b/data/cities/newport-news/t-mobile-jefferson-avenue.yml
index a9b252624..43d80aba7 100644
--- a/data/cities/newport-news/t-mobile-jefferson-avenue.yml
+++ b/data/cities/newport-news/t-mobile-jefferson-avenue.yml
@@ -1,11 +1,11 @@
-id: 5440632244
+id: 5427925742
 type: node
-latitude: 37.12671
-longitude: -76.51141
+latitude: 37.11107
+longitude: -76.49782
 postcode: "23602"
 city: Newport News
 street: Jefferson Avenue
-housenumber: "12515"
+housenumber: "12300"
 phone: ""
-opening_hours: ""
+opening_hours: Mo-Sa 10:00-21:00, Su12:00-18:00
 website: ""
diff --git a/data/cities/newport-news/t-mobile.yml b/data/cities/newport-news/t-mobile.yml
index 43d80aba7..a9b252624 100644
--- a/data/cities/newport-news/t-mobile.yml
+++ b/data/cities/newport-news/t-mobile.yml
@@ -1,11 +1,11 @@
-id: 5427925742
+id: 5440632244
 type: node
-latitude: 37.11107
-longitude: -76.49782
+latitude: 37.12671
+longitude: -76.51141
 postcode: "23602"
 city: Newport News
 street: Jefferson Avenue
-housenumber: "12300"
+housenumber: "12515"
 phone: ""
-opening_hours: Mo-Sa 10:00-21:00, Su12:00-18:00
+opening_hours: ""
 website: ""
diff --git a/data/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.yml b/data/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.yml
deleted file mode 100644
index 6e1123b51..000000000
--- a/data/cities/newport-news/tire-choice-auto-service-center-warwick-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 333239467
-type: node
-latitude: 37.12306
-longitude: -76.52984
-postcode: "23602"
-city: Newport News
-street: Warwick Boulevard
-housenumber: "13781"
-phone: 757-538-7653
-opening_hours: Mo-Fr 07:30-19:00; Sa 07:30-18:00
-website: ""
diff --git a/data/cities/newport-news/tire-choice-auto-service-center.yml b/data/cities/newport-news/tire-choice-auto-service-center.yml
index cc1a801d4..6e1123b51 100644
--- a/data/cities/newport-news/tire-choice-auto-service-center.yml
+++ b/data/cities/newport-news/tire-choice-auto-service-center.yml
@@ -1,11 +1,11 @@
-id: 228618175
+id: 333239467
 type: node
-latitude: 37.11222
-longitude: -76.47023
+latitude: 37.12306
+longitude: -76.52984
 postcode: "23602"
 city: Newport News
-street: Arthur Way
-housenumber: "110"
-phone: ""
-opening_hours: ""
+street: Warwick Boulevard
+housenumber: "13781"
+phone: 757-538-7653
+opening_hours: Mo-Fr 07:30-19:00; Sa 07:30-18:00
 website: ""
diff --git a/data/cities/newport-news/tire-choice.yml b/data/cities/newport-news/tire-choice.yml
new file mode 100644
index 000000000..cc1a801d4
--- /dev/null
+++ b/data/cities/newport-news/tire-choice.yml
@@ -0,0 +1,11 @@
+id: 228618175
+type: node
+latitude: 37.11222
+longitude: -76.47023
+postcode: "23602"
+city: Newport News
+street: Arthur Way
+housenumber: "110"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.yml b/data/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.yml
deleted file mode 100644
index 885233a37..000000000
--- a/data/cities/norfolk/cvs-pharmacy-east-little-creek-road-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 407084365
-type: node
-latitude: 36.9177
-longitude: -76.19332
-postcode: "23518"
-city: Norfolk
-street: East Little Creek Road
-housenumber: "4261"
-phone: ""
-opening_hours: ""
-website: https://www.cvs.com/store-locator/norfolk-va-pharmacies/4261-e-little-creek-rd-norfolk-va-23518/storeid=6146
diff --git a/data/cities/norfolk/cvs-pharmacy-east-little-creek-road.yml b/data/cities/norfolk/cvs-pharmacy-east-little-creek-road.yml
index c41175b78..885233a37 100644
--- a/data/cities/norfolk/cvs-pharmacy-east-little-creek-road.yml
+++ b/data/cities/norfolk/cvs-pharmacy-east-little-creek-road.yml
@@ -1,11 +1,11 @@
-id: 407056662
+id: 407084365
 type: node
-latitude: 36.91538
-longitude: -76.24257
+latitude: 36.9177
+longitude: -76.19332
 postcode: "23518"
 city: Norfolk
 street: East Little Creek Road
-housenumber: "972"
+housenumber: "4261"
 phone: ""
 opening_hours: ""
-website: https://www.cvs.com/store-locator/norfolk-va-pharmacies/972-e-little-creek-rd-norfolk-va-23518/storeid=1826
+website: https://www.cvs.com/store-locator/norfolk-va-pharmacies/4261-e-little-creek-rd-norfolk-va-23518/storeid=6146
diff --git a/data/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.yml b/data/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.yml
new file mode 100644
index 000000000..7fd3e3529
--- /dev/null
+++ b/data/cities/norfolk/cvs-pharmacy-east-virginia-beach-boulevard.yml
@@ -0,0 +1,11 @@
+id: 406973861
+type: node
+latitude: 36.85469
+longitude: -76.195
+postcode: "23502"
+city: Norfolk
+street: East Virginia Beach Boulevard
+housenumber: "6135"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/norfolk/cvs-pharmacy.yml b/data/cities/norfolk/cvs-pharmacy.yml
index 7fd3e3529..c41175b78 100644
--- a/data/cities/norfolk/cvs-pharmacy.yml
+++ b/data/cities/norfolk/cvs-pharmacy.yml
@@ -1,11 +1,11 @@
-id: 406973861
+id: 407056662
 type: node
-latitude: 36.85469
-longitude: -76.195
-postcode: "23502"
+latitude: 36.91538
+longitude: -76.24257
+postcode: "23518"
 city: Norfolk
-street: East Virginia Beach Boulevard
-housenumber: "6135"
+street: East Little Creek Road
+housenumber: "972"
 phone: ""
 opening_hours: ""
-website: ""
+website: https://www.cvs.com/store-locator/norfolk-va-pharmacies/972-e-little-creek-rd-norfolk-va-23518/storeid=1826
diff --git a/data/cities/norfolk/rite-aid-east-little-creek-road.yml b/data/cities/norfolk/rite-aid-east-little-creek-road.yml
deleted file mode 100644
index f4303799b..000000000
--- a/data/cities/norfolk/rite-aid-east-little-creek-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 407093289
-type: node
-latitude: 36.91384
-longitude: -76.24101
-postcode: "23513"
-city: Norfolk
-street: East Little Creek Road
-housenumber: "1101"
-phone: ""
-opening_hours: Mo-Fr 09:00-21:00; Sa 09:00-18:00; Su 10:00-18:00
-website: https://www.riteaid.com/locations/va/norfolk/1101-east-little-creek-road.html
diff --git a/data/cities/norfolk/rite-aid-tidewater-drive.yml b/data/cities/norfolk/rite-aid-tidewater-drive.yml
new file mode 100644
index 000000000..c3effdcea
--- /dev/null
+++ b/data/cities/norfolk/rite-aid-tidewater-drive.yml
@@ -0,0 +1,11 @@
+id: 407110888
+type: node
+latitude: 36.88626
+longitude: -76.25985
+postcode: "23509"
+city: Norfolk
+street: Tidewater Drive
+housenumber: "3600"
+phone: ""
+opening_hours: Mo-Fr 09:00-21:00; Sa 09:00-18:00; Su 10:00-18:00
+website: https://www.riteaid.com/locations/va/norfolk/3600-tidewater-drive.html
diff --git a/data/cities/norfolk/rite-aid.yml b/data/cities/norfolk/rite-aid.yml
index c3effdcea..f4303799b 100644
--- a/data/cities/norfolk/rite-aid.yml
+++ b/data/cities/norfolk/rite-aid.yml
@@ -1,11 +1,11 @@
-id: 407110888
+id: 407093289
 type: node
-latitude: 36.88626
-longitude: -76.25985
-postcode: "23509"
+latitude: 36.91384
+longitude: -76.24101
+postcode: "23513"
 city: Norfolk
-street: Tidewater Drive
-housenumber: "3600"
+street: East Little Creek Road
+housenumber: "1101"
 phone: ""
 opening_hours: Mo-Fr 09:00-21:00; Sa 09:00-18:00; Su 10:00-18:00
-website: https://www.riteaid.com/locations/va/norfolk/3600-tidewater-drive.html
+website: https://www.riteaid.com/locations/va/norfolk/1101-east-little-creek-road.html
diff --git a/data/cities/norfolk/wawa-east-little-creek-road.yml b/data/cities/norfolk/wawa-east-little-creek-road.yml
deleted file mode 100644
index c44b9af28..000000000
--- a/data/cities/norfolk/wawa-east-little-creek-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 407094268
-type: node
-latitude: 36.91403
-longitude: -76.24247
-postcode: "23513"
-city: Norfolk
-street: East Little Creek Road
-housenumber: "975"
-phone: ""
-opening_hours: 24/7
-website: https://www.wawa.com/locations/8604
diff --git a/data/cities/norfolk/wawa-north-military-highway-2.yml b/data/cities/norfolk/wawa-north-military-highway-2.yml
new file mode 100644
index 000000000..cb18c69b1
--- /dev/null
+++ b/data/cities/norfolk/wawa-north-military-highway-2.yml
@@ -0,0 +1,11 @@
+id: 1218369125
+type: node
+latitude: 36.86112
+longitude: -76.20914
+postcode: "23502"
+city: Norfolk
+street: North Military Highway
+housenumber: "1146"
+phone: +1 757-525-9914
+opening_hours: Mo-Su 03:00-01:00
+website: https://www.wawa.com/locations/8645
diff --git a/data/cities/norfolk/wawa-north-military-highway.yml b/data/cities/norfolk/wawa-north-military-highway.yml
index cb18c69b1..e1b68e896 100644
--- a/data/cities/norfolk/wawa-north-military-highway.yml
+++ b/data/cities/norfolk/wawa-north-military-highway.yml
@@ -1,11 +1,11 @@
-id: 1218369125
+id: 407115483
 type: node
-latitude: 36.86112
-longitude: -76.20914
-postcode: "23502"
+latitude: 36.89717
+longitude: -76.22646
+postcode: "23513"
 city: Norfolk
 street: North Military Highway
-housenumber: "1146"
-phone: +1 757-525-9914
-opening_hours: Mo-Su 03:00-01:00
-website: https://www.wawa.com/locations/8645
+housenumber: "6301"
+phone: ""
+opening_hours: 24/7
+website: https://www.wawa.com/locations/8628
diff --git a/data/cities/norfolk/wawa.yml b/data/cities/norfolk/wawa.yml
index e1b68e896..c44b9af28 100644
--- a/data/cities/norfolk/wawa.yml
+++ b/data/cities/norfolk/wawa.yml
@@ -1,11 +1,11 @@
-id: 407115483
+id: 407094268
 type: node
-latitude: 36.89717
-longitude: -76.22646
+latitude: 36.91403
+longitude: -76.24247
 postcode: "23513"
 city: Norfolk
-street: North Military Highway
-housenumber: "6301"
+street: East Little Creek Road
+housenumber: "975"
 phone: ""
 opening_hours: 24/7
-website: https://www.wawa.com/locations/8628
+website: https://www.wawa.com/locations/8604
diff --git a/data/cities/north-chesterfield/kroger-hicks-road.yml b/data/cities/north-chesterfield/kroger-hicks-road.yml
deleted file mode 100644
index 3d663e346..000000000
--- a/data/cities/north-chesterfield/kroger-hicks-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 235996970
-type: node
-latitude: 37.46217
-longitude: -77.54804
-postcode: "23235"
-city: North Chesterfield
-street: Hicks Road
-housenumber: "2821"
-phone: +1 804-675-2288
-opening_hours: Mo-Fr 08:00-20:00;Sa 09:00-18:00;Su 10:00-17:00
-website: https://www.kroger.com/stores/grocery/va/north-chesterfield/hicks/029/00501
diff --git a/data/cities/north-chesterfield/kroger-tim-price-way.yml b/data/cities/north-chesterfield/kroger-tim-price-way.yml
new file mode 100644
index 000000000..5831ce320
--- /dev/null
+++ b/data/cities/north-chesterfield/kroger-tim-price-way.yml
@@ -0,0 +1,11 @@
+id: 253242055
+type: node
+latitude: 37.49955
+longitude: -77.52514
+postcode: "23225"
+city: North Chesterfield
+street: Tim Price Way
+housenumber: "7000"
+phone: +1 804-772-8540
+opening_hours: Mo-Su 06:00-24:00
+website: https://www.kroger.com/stores/grocery/va/north-chesterfield/stonebridge/029/00514
diff --git a/data/cities/north-chesterfield/kroger.yml b/data/cities/north-chesterfield/kroger.yml
index 5831ce320..3d663e346 100644
--- a/data/cities/north-chesterfield/kroger.yml
+++ b/data/cities/north-chesterfield/kroger.yml
@@ -1,11 +1,11 @@
-id: 253242055
+id: 235996970
 type: node
-latitude: 37.49955
-longitude: -77.52514
-postcode: "23225"
+latitude: 37.46217
+longitude: -77.54804
+postcode: "23235"
 city: North Chesterfield
-street: Tim Price Way
-housenumber: "7000"
-phone: +1 804-772-8540
-opening_hours: Mo-Su 06:00-24:00
-website: https://www.kroger.com/stores/grocery/va/north-chesterfield/stonebridge/029/00514
+street: Hicks Road
+housenumber: "2821"
+phone: +1 804-675-2288
+opening_hours: Mo-Fr 08:00-20:00;Sa 09:00-18:00;Su 10:00-17:00
+website: https://www.kroger.com/stores/grocery/va/north-chesterfield/hicks/029/00501
diff --git a/data/cities/portsmouth/book-nook.yml b/data/cities/portsmouth/book-nook.yml
new file mode 100644
index 000000000..3688451c9
--- /dev/null
+++ b/data/cities/portsmouth/book-nook.yml
@@ -0,0 +1,11 @@
+id: 12408521332
+type: node
+latitude: 36.85246
+longitude: -76.37829
+postcode: "23703"
+city: Portsmouth
+street: High Street West
+housenumber: "4934"
+phone: +1 850-319-6000
+opening_hours: Mo-Fri 10:00-16:00; Sa 10:00-14:00
+website: https://www.friendsofportsmouthlibrary.org/
diff --git a/data/cities/portsmouth/book-owl-bookstore.yml b/data/cities/portsmouth/book-owl-bookstore.yml
new file mode 100644
index 000000000..88a702af9
--- /dev/null
+++ b/data/cities/portsmouth/book-owl-bookstore.yml
@@ -0,0 +1,11 @@
+id: 6622698368
+type: node
+latitude: 36.86305
+longitude: -76.39216
+postcode: "23703"
+city: Portsmouth
+street: Churchland Boulevard
+housenumber: "5772"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/portsmouth/harris-tire-service.yml b/data/cities/portsmouth/harris-tire-service.yml
new file mode 100644
index 000000000..109548727
--- /dev/null
+++ b/data/cities/portsmouth/harris-tire-service.yml
@@ -0,0 +1,11 @@
+id: 667412171
+type: node
+latitude: 36.8617
+longitude: -76.39716
+postcode: "23703"
+city: Portsmouth
+street: High Street West
+housenumber: "5924"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/portsmouth/land-and-coates.yml b/data/cities/portsmouth/land-and-coates.yml
new file mode 100644
index 000000000..b447fe7b1
--- /dev/null
+++ b/data/cities/portsmouth/land-and-coates.yml
@@ -0,0 +1,11 @@
+id: 702292542
+type: node
+latitude: 36.86284
+longitude: -76.39348
+postcode: "23703"
+city: Portsmouth
+street: Churchland Boulevard
+housenumber: "5808"
+phone: +1-757-271-0684
+opening_hours: ""
+website: ""
diff --git a/data/cities/portsmouth/number-one-nails.yml b/data/cities/portsmouth/number-one-nails.yml
new file mode 100644
index 000000000..48ac696e9
--- /dev/null
+++ b/data/cities/portsmouth/number-one-nails.yml
@@ -0,0 +1,11 @@
+id: 6622698372
+type: node
+latitude: 36.86265
+longitude: -76.3926
+postcode: "23703"
+city: Portsmouth
+street: Churchland Boulevard
+housenumber: "5790"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/portsmouth/rite-aid-airline-boulevard.yml b/data/cities/portsmouth/rite-aid-airline-boulevard.yml
deleted file mode 100644
index fa1ad9d4e..000000000
--- a/data/cities/portsmouth/rite-aid-airline-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 701439481
-type: node
-latitude: 36.80466
-longitude: -76.38225
-postcode: "23701"
-city: Portsmouth
-street: Airline Boulevard
-housenumber: "3531"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/portsmouth/rite-aid.yml b/data/cities/portsmouth/rite-aid.yml
index 9479f2eee..fa1ad9d4e 100644
--- a/data/cities/portsmouth/rite-aid.yml
+++ b/data/cities/portsmouth/rite-aid.yml
@@ -1,11 +1,11 @@
-id: 667412185
+id: 701439481
 type: node
-latitude: 36.86179
-longitude: -76.39662
-postcode: "23703"
+latitude: 36.80466
+longitude: -76.38225
+postcode: "23701"
 city: Portsmouth
-street: High Street West
-housenumber: "5914"
+street: Airline Boulevard
+housenumber: "3531"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/portsmouth/virginia-abc.yml b/data/cities/portsmouth/virginia-abc.yml
new file mode 100644
index 000000000..105985d5b
--- /dev/null
+++ b/data/cities/portsmouth/virginia-abc.yml
@@ -0,0 +1,11 @@
+id: 12408679554
+type: node
+latitude: 36.85995
+longitude: -76.39612
+postcode: "23703"
+city: Portsmouth
+street: High Street West
+housenumber: "5909"
+phone: +1 757-483-2195
+opening_hours: Mo-Sa 10:00-21:00; Sun 12:00-18:00
+website: https://www.abc.virginia.gov/stores/288
diff --git a/data/cities/portsmouth/warrant-realty-inc.yml b/data/cities/portsmouth/warrant-realty-inc.yml
deleted file mode 100644
index 187a76c30..000000000
--- a/data/cities/portsmouth/warrant-realty-inc.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 701448272
-type: node
-latitude: 36.86907
-longitude: -76.37733
-postcode: "23703"
-city: Portsmouth
-street: West Norfolk Road
-housenumber: "4940"
-phone: (757) 420-8500
-opening_hours: ""
-website: warrantrealty.com
diff --git a/data/cities/portsmouth/wawa-frederick-boulevard.yml b/data/cities/portsmouth/wawa-frederick-boulevard.yml
deleted file mode 100644
index 8235b86c5..000000000
--- a/data/cities/portsmouth/wawa-frederick-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 604751022
-type: node
-latitude: 36.82835
-longitude: -76.33996
-postcode: 23707-4119
-city: Portsmouth
-street: Frederick Boulevard
-housenumber: "1200"
-phone: +1 757-393-0189
-opening_hours: 24/7
-website: https://www.wawa.com/locations/8636
diff --git a/data/cities/portsmouth/wawa-victory-boulevard.yml b/data/cities/portsmouth/wawa-victory-boulevard.yml
new file mode 100644
index 000000000..b4c84a522
--- /dev/null
+++ b/data/cities/portsmouth/wawa-victory-boulevard.yml
@@ -0,0 +1,11 @@
+id: 693883362
+type: node
+latitude: 36.81073
+longitude: -76.35999
+postcode: "23701"
+city: Portsmouth
+street: Victory Boulevard
+housenumber: "4005"
+phone: +1 757-488-1472
+opening_hours: 24/7
+website: https://www.wawa.com/locations/8612
diff --git a/data/cities/portsmouth/wawa.yml b/data/cities/portsmouth/wawa.yml
index b4c84a522..8235b86c5 100644
--- a/data/cities/portsmouth/wawa.yml
+++ b/data/cities/portsmouth/wawa.yml
@@ -1,11 +1,11 @@
-id: 693883362
+id: 604751022
 type: node
-latitude: 36.81073
-longitude: -76.35999
-postcode: "23701"
+latitude: 36.82835
+longitude: -76.33996
+postcode: 23707-4119
 city: Portsmouth
-street: Victory Boulevard
-housenumber: "4005"
-phone: +1 757-488-1472
+street: Frederick Boulevard
+housenumber: "1200"
+phone: +1 757-393-0189
 opening_hours: 24/7
-website: https://www.wawa.com/locations/8612
+website: https://www.wawa.com/locations/8636
diff --git a/data/cities/powhatan/food-lion-academy-road.yml b/data/cities/powhatan/food-lion-academy-road.yml
deleted file mode 100644
index c199f4ebd..000000000
--- a/data/cities/powhatan/food-lion-academy-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2334093868
-type: node
-latitude: 37.53945
-longitude: -77.88492
-postcode: "23139"
-city: Powhatan
-street: Academy Road
-housenumber: "2105"
-phone: +1-804-598-6880
-opening_hours: Mo-Su 07:00-23:00
-website: ""
diff --git a/data/cities/powhatan/food-lion-south-creek-one.yml b/data/cities/powhatan/food-lion-south-creek-one.yml
new file mode 100644
index 000000000..622fe6f5d
--- /dev/null
+++ b/data/cities/powhatan/food-lion-south-creek-one.yml
@@ -0,0 +1,11 @@
+id: 2334785499
+type: node
+latitude: 37.51601
+longitude: -77.79039
+postcode: "23139"
+city: Powhatan
+street: South Creek One
+housenumber: "1800"
+phone: +1 804-378-9105
+opening_hours: ""
+website: https://foodlion.com/
diff --git a/data/cities/powhatan/food-lion.yml b/data/cities/powhatan/food-lion.yml
index 622fe6f5d..c199f4ebd 100644
--- a/data/cities/powhatan/food-lion.yml
+++ b/data/cities/powhatan/food-lion.yml
@@ -1,11 +1,11 @@
-id: 2334785499
+id: 2334093868
 type: node
-latitude: 37.51601
-longitude: -77.79039
+latitude: 37.53945
+longitude: -77.88492
 postcode: "23139"
 city: Powhatan
-street: South Creek One
-housenumber: "1800"
-phone: +1 804-378-9105
-opening_hours: ""
-website: https://foodlion.com/
+street: Academy Road
+housenumber: "2105"
+phone: +1-804-598-6880
+opening_hours: Mo-Su 07:00-23:00
+website: ""
diff --git a/data/cities/powhatan/virginia-abc-academy-road.yml b/data/cities/powhatan/virginia-abc-academy-road.yml
deleted file mode 100644
index 87d3962fe..000000000
--- a/data/cities/powhatan/virginia-abc-academy-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2334093871
-type: node
-latitude: 37.53959
-longitude: -77.88544
-postcode: "23139"
-city: Powhatan
-street: Academy Road
-housenumber: "2105"
-phone: +1-804-598-1527
-opening_hours: Mo-Sa 10:00-21:00; Su 12:00-18:00
-website: ""
diff --git a/data/cities/powhatan/virginia-abc-south-creek-one.yml b/data/cities/powhatan/virginia-abc-south-creek-one.yml
new file mode 100644
index 000000000..683991c25
--- /dev/null
+++ b/data/cities/powhatan/virginia-abc-south-creek-one.yml
@@ -0,0 +1,11 @@
+id: 2334785501
+type: node
+latitude: 37.51594
+longitude: -77.78995
+postcode: "23139"
+city: Powhatan
+street: South Creek One
+housenumber: "1800"
+phone: +1-804-563-2077
+opening_hours: Mo-Sa 10:00-21:00; Su 12:00-18:00
+website: https://www.abc.virginia.gov/stores/77
diff --git a/data/cities/powhatan/virginia-abc.yml b/data/cities/powhatan/virginia-abc.yml
index 683991c25..87d3962fe 100644
--- a/data/cities/powhatan/virginia-abc.yml
+++ b/data/cities/powhatan/virginia-abc.yml
@@ -1,11 +1,11 @@
-id: 2334785501
+id: 2334093871
 type: node
-latitude: 37.51594
-longitude: -77.78995
+latitude: 37.53959
+longitude: -77.88544
 postcode: "23139"
 city: Powhatan
-street: South Creek One
-housenumber: "1800"
-phone: +1-804-563-2077
+street: Academy Road
+housenumber: "2105"
+phone: +1-804-598-1527
 opening_hours: Mo-Sa 10:00-21:00; Su 12:00-18:00
-website: https://www.abc.virginia.gov/stores/77
+website: ""
diff --git a/data/cities/quinton/beyond-nail-and-day-spa.yml b/data/cities/quinton/beyond-nail-and-day-spa.yml
index 5c57d4fa2..dec836cea 100644
--- a/data/cities/quinton/beyond-nail-and-day-spa.yml
+++ b/data/cities/quinton/beyond-nail-and-day-spa.yml
@@ -1,11 +1,12 @@
 id: 7369400674
 type: node
-latitude: 37.51972
+latitude: 37.51973
 longitude: -77.1858
 postcode: "23141"
 city: Quinton
 street: New Kent Highway
 housenumber: "2501"
 phone: +1 804-932-8299
-opening_hours: ""
+opening_hours: Tu-Fr 09:30-19:00; Sa 9:30-18:00; Su-Mo off; Dec 22 09:00-15:00; Dec
+    24 09:00-16:00; Dec 25 off
 website: http://www.beyondnailsdayspa.com/
diff --git a/data/cities/quinton/hawthorne-laundry-and-dry-cleaners.yml b/data/cities/quinton/brooks-stitch-and-fold.yml
similarity index 55%
rename from data/cities/quinton/hawthorne-laundry-and-dry-cleaners.yml
rename to data/cities/quinton/brooks-stitch-and-fold.yml
index ceb38b69d..9bdecc6f6 100644
--- a/data/cities/quinton/hawthorne-laundry-and-dry-cleaners.yml
+++ b/data/cities/quinton/brooks-stitch-and-fold.yml
@@ -1,11 +1,11 @@
 id: 6548515212
 type: node
-latitude: 37.5195
-longitude: -77.18497
+latitude: 37.51951
+longitude: -77.18495
 postcode: "23141"
 city: Quinton
 street: New Kent Highway
-housenumber: "2591"
+housenumber: "2585"
 phone: +1 804-932-9350
-opening_hours: ""
+opening_hours: Mo,We,Fr 10:00-14:00
 website: ""
diff --git a/data/cities/quinton/dollar-general-market.yml b/data/cities/quinton/dollar-general-market.yml
index 3d2df1e94..c1d241c98 100644
--- a/data/cities/quinton/dollar-general-market.yml
+++ b/data/cities/quinton/dollar-general-market.yml
@@ -1,11 +1,11 @@
 id: 690895637
 type: node
-latitude: 37.50872
-longitude: -77.19073
+latitude: 37.50871
+longitude: -77.1907
 postcode: "23141"
 city: Quinton
 street: Pocahontas Trail
 housenumber: "2375"
 phone: ""
-opening_hours: ""
-website: https://www.dollargeneral.com/store-directory/va/quinton/15281
+opening_hours: 08:00-21:00
+website: ""
diff --git a/data/cities/quinton/food-lion.yml b/data/cities/quinton/food-lion.yml
index 637753a59..5c83a280f 100644
--- a/data/cities/quinton/food-lion.yml
+++ b/data/cities/quinton/food-lion.yml
@@ -7,5 +7,5 @@ city: Quinton
 street: New Kent Highway
 housenumber: "2589"
 phone: ""
-opening_hours: ""
+opening_hours: 07:00-23:00; Dec 24 07:00-18:00; Dec 25 off
 website: ""
diff --git a/data/cities/quinton/margeauxs-florist.yml b/data/cities/quinton/new-kent-floral.yml
similarity index 51%
rename from data/cities/quinton/margeauxs-florist.yml
rename to data/cities/quinton/new-kent-floral.yml
index 09d8d2922..4e346f9a9 100644
--- a/data/cities/quinton/margeauxs-florist.yml
+++ b/data/cities/quinton/new-kent-floral.yml
@@ -1,11 +1,11 @@
 id: 6548515210
 type: node
-latitude: 37.51947
-longitude: -77.18503
+latitude: 37.51949
+longitude: -77.185
 postcode: "23141"
 city: Quinton
 street: New Kent Highway
 housenumber: "2585"
 phone: ""
-opening_hours: ""
-website: https://www.margeauxsatnewkent.com
+opening_hours: Mo-Fr 09:00-16:00; Sa 09:00-13:00; Su off
+website: ""
diff --git a/data/cities/quinton/salon-249.yml b/data/cities/quinton/salon-249.yml
index e615f2030..b9c7451d6 100644
--- a/data/cities/quinton/salon-249.yml
+++ b/data/cities/quinton/salon-249.yml
@@ -1,11 +1,11 @@
 id: 6548515207
 type: node
-latitude: 37.51942
-longitude: -77.18514
+latitude: 37.51944
+longitude: -77.18511
 postcode: "23141"
 city: Quinton
 street: New Kent Highway
 housenumber: "2581"
-phone: 804-932-9861
+phone: +1 804-932-9861
 opening_hours: Tu-Fr 09:00-18:00; Sa 09:00-16:00
 website: ""
diff --git a/data/cities/quinton/verizon-authorized-retailer.yml b/data/cities/quinton/verizon-authorized-retailer.yml
index bab85e02f..a17ce615a 100644
--- a/data/cities/quinton/verizon-authorized-retailer.yml
+++ b/data/cities/quinton/verizon-authorized-retailer.yml
@@ -1,11 +1,11 @@
 id: 7369400685
 type: node
-latitude: 37.51975
-longitude: -77.18572
+latitude: 37.51976
+longitude: -77.18573
 postcode: "23141"
 city: Quinton
 street: New Kent Highway
 housenumber: "2501"
 phone: +1 804-201-9755
-opening_hours: ""
+opening_hours: Mo-Sa 09:00-20:00; Su 11:00-17:00
 website: https://shop.wirelesszone.com/va/quinton/2501-a-new-kent-highway
diff --git a/data/cities/quinton/virginia-abc.yml b/data/cities/quinton/virginia-abc.yml
index 6ea155efc..bffc48432 100644
--- a/data/cities/quinton/virginia-abc.yml
+++ b/data/cities/quinton/virginia-abc.yml
@@ -1,11 +1,11 @@
 id: 7369400679
 type: node
-latitude: 37.51969
-longitude: -77.18588
+latitude: 37.5197
+longitude: -77.18589
 postcode: "23141"
 city: Quinton
 street: New Kent Highway
 housenumber: "2501"
 phone: +1 804-932-5462
-opening_hours: ""
+opening_hours: Mo-Sa 10:00-21:00; Su 10:00-18:00
 website: https://www.abc.virginia.gov/stores/38
diff --git a/data/cities/richmond/7-eleven-gayton-road.yml b/data/cities/richmond/7-eleven-gayton-road.yml
deleted file mode 100644
index c5cb42541..000000000
--- a/data/cities/richmond/7-eleven-gayton-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3165968817
-type: node
-latitude: 37.61912
-longitude: -77.63832
-postcode: "23238"
-city: Richmond
-street: Gayton Road
-housenumber: "12395"
-phone: +1 804-740-3421
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/richmond/12395-gayton-rd-19623
diff --git a/data/cities/richmond/7-eleven-north-arch-road.yml b/data/cities/richmond/7-eleven-north-arch-road.yml
new file mode 100644
index 000000000..02f1479da
--- /dev/null
+++ b/data/cities/richmond/7-eleven-north-arch-road.yml
@@ -0,0 +1,11 @@
+id: 3128391994
+type: node
+latitude: 37.49777
+longitude: -77.57008
+postcode: 23236-3411
+city: Richmond
+street: North Arch Road
+housenumber: "320"
+phone: +1 804-323-0337
+opening_hours: ""
+website: https://www.7-eleven.com/locations/va/richmond/320-north-arch-rd-15891
diff --git a/data/cities/richmond/7-eleven.yml b/data/cities/richmond/7-eleven.yml
index 02f1479da..c5cb42541 100644
--- a/data/cities/richmond/7-eleven.yml
+++ b/data/cities/richmond/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 3128391994
+id: 3165968817
 type: node
-latitude: 37.49777
-longitude: -77.57008
-postcode: 23236-3411
+latitude: 37.61912
+longitude: -77.63832
+postcode: "23238"
 city: Richmond
-street: North Arch Road
-housenumber: "320"
-phone: +1 804-323-0337
+street: Gayton Road
+housenumber: "12395"
+phone: +1 804-740-3421
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/richmond/320-north-arch-rd-15891
+website: https://www.7-eleven.com/locations/va/richmond/12395-gayton-rd-19623
diff --git a/data/cities/richmond/walgreens-brook-road.yml b/data/cities/richmond/walgreens-brook-road.yml
new file mode 100644
index 000000000..578728b59
--- /dev/null
+++ b/data/cities/richmond/walgreens-brook-road.yml
@@ -0,0 +1,11 @@
+id: 751081695
+type: node
+latitude: 37.60056
+longitude: -77.45342
+postcode: "23227"
+city: Richmond
+street: Brook Road
+housenumber: "5021"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/richmond/walgreens-hull-street-road.yml b/data/cities/richmond/walgreens-hull-street-road.yml
deleted file mode 100644
index 68194890f..000000000
--- a/data/cities/richmond/walgreens-hull-street-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 745218156
-type: node
-latitude: 37.49375
-longitude: -77.48782
-postcode: "23224"
-city: Richmond
-street: Hull Street Road
-housenumber: "5122"
-phone: ""
-opening_hours: ""
-website: https://www.walgreens.com/locator/walgreens-5122+hull+street+rd-richmond-va-23224/id=3682
diff --git a/data/cities/richmond/walgreens.yml b/data/cities/richmond/walgreens.yml
index 578728b59..68194890f 100644
--- a/data/cities/richmond/walgreens.yml
+++ b/data/cities/richmond/walgreens.yml
@@ -1,11 +1,11 @@
-id: 751081695
+id: 745218156
 type: node
-latitude: 37.60056
-longitude: -77.45342
-postcode: "23227"
+latitude: 37.49375
+longitude: -77.48782
+postcode: "23224"
 city: Richmond
-street: Brook Road
-housenumber: "5021"
+street: Hull Street Road
+housenumber: "5122"
 phone: ""
 opening_hours: ""
-website: ""
+website: https://www.walgreens.com/locator/walgreens-5122+hull+street+rd-richmond-va-23224/id=3682
diff --git a/data/cities/richmond/wawa-midlothian-turnpike-2.yml b/data/cities/richmond/wawa-midlothian-turnpike-2.yml
deleted file mode 100644
index 5ee657273..000000000
--- a/data/cities/richmond/wawa-midlothian-turnpike-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 366207796
-type: node
-latitude: 37.50542
-longitude: -77.60072
-postcode: "23235"
-city: Richmond
-street: Midlothian Turnpike
-housenumber: "11021"
-phone: ""
-opening_hours: 24/7
-website: https://www.wawa.com/locations/659
diff --git a/data/cities/richmond/wawa-midlothian-turnpike.yml b/data/cities/richmond/wawa-midlothian-turnpike.yml
index 69bb10ecb..5ee657273 100644
--- a/data/cities/richmond/wawa-midlothian-turnpike.yml
+++ b/data/cities/richmond/wawa-midlothian-turnpike.yml
@@ -1,11 +1,11 @@
-id: 236025815
+id: 366207796
 type: node
-latitude: 37.50025
-longitude: -77.5352
-postcode: "23225"
+latitude: 37.50542
+longitude: -77.60072
+postcode: "23235"
 city: Richmond
 street: Midlothian Turnpike
-housenumber: "7514"
+housenumber: "11021"
 phone: ""
 opening_hours: 24/7
-website: https://www.wawa.com/locations/672
+website: https://www.wawa.com/locations/659
diff --git a/data/cities/richmond/wawa-west-broad-street.yml b/data/cities/richmond/wawa-west-broad-street.yml
new file mode 100644
index 000000000..ebdb35953
--- /dev/null
+++ b/data/cities/richmond/wawa-west-broad-street.yml
@@ -0,0 +1,11 @@
+id: 263148667
+type: node
+latitude: 37.64846
+longitude: -77.58982
+postcode: "23060"
+city: Richmond
+street: West Broad Street
+housenumber: "11052"
+phone: ""
+opening_hours: 24/7
+website: https://www.wawa.com/locations/8615
diff --git a/data/cities/richmond/wawa.yml b/data/cities/richmond/wawa.yml
index ebdb35953..69bb10ecb 100644
--- a/data/cities/richmond/wawa.yml
+++ b/data/cities/richmond/wawa.yml
@@ -1,11 +1,11 @@
-id: 263148667
+id: 236025815
 type: node
-latitude: 37.64846
-longitude: -77.58982
-postcode: "23060"
+latitude: 37.50025
+longitude: -77.5352
+postcode: "23225"
 city: Richmond
-street: West Broad Street
-housenumber: "11052"
+street: Midlothian Turnpike
+housenumber: "7514"
 phone: ""
 opening_hours: 24/7
-website: https://www.wawa.com/locations/8615
+website: https://www.wawa.com/locations/672
diff --git a/data/cities/roanoke/petsmart-franklin-road-southwest.yml b/data/cities/roanoke/petsmart-franklin-road-southwest.yml
deleted file mode 100644
index 8fda1ee31..000000000
--- a/data/cities/roanoke/petsmart-franklin-road-southwest.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2868829919
-type: node
-latitude: 37.22422
-longitude: -79.96614
-postcode: "24014"
-city: Roanoke
-street: Franklin Road Southwest
-housenumber: "4210"
-phone: +1 540-283-5301
-opening_hours: Mo-Sa 09:00-20:00; Su 10:00-19:00
-website: https://www.petsmart.com/stores/us/va/roanoke-store2364.html
diff --git a/data/cities/roanoke/petsmart-valley-view-boulevard-northwest.yml b/data/cities/roanoke/petsmart-valley-view-boulevard-northwest.yml
new file mode 100644
index 000000000..28458efbb
--- /dev/null
+++ b/data/cities/roanoke/petsmart-valley-view-boulevard-northwest.yml
@@ -0,0 +1,11 @@
+id: 2691283078
+type: node
+latitude: 37.30078
+longitude: -79.958
+postcode: "24012"
+city: Roanoke
+street: Valley View Boulevard Northwest
+housenumber: "4749"
+phone: +1 540-362-2994
+opening_hours: Mo-Sa 09:00-21:00; Su 10:00-19:00
+website: https://www.petsmart.com/stores/us/va/roanoke-store0677.html
diff --git a/data/cities/roanoke/petsmart.yml b/data/cities/roanoke/petsmart.yml
index 28458efbb..8fda1ee31 100644
--- a/data/cities/roanoke/petsmart.yml
+++ b/data/cities/roanoke/petsmart.yml
@@ -1,11 +1,11 @@
-id: 2691283078
+id: 2868829919
 type: node
-latitude: 37.30078
-longitude: -79.958
-postcode: "24012"
+latitude: 37.22422
+longitude: -79.96614
+postcode: "24014"
 city: Roanoke
-street: Valley View Boulevard Northwest
-housenumber: "4749"
-phone: +1 540-362-2994
-opening_hours: Mo-Sa 09:00-21:00; Su 10:00-19:00
-website: https://www.petsmart.com/stores/us/va/roanoke-store0677.html
+street: Franklin Road Southwest
+housenumber: "4210"
+phone: +1 540-283-5301
+opening_hours: Mo-Sa 09:00-20:00; Su 10:00-19:00
+website: https://www.petsmart.com/stores/us/va/roanoke-store2364.html
diff --git a/data/cities/sandston/7-eleven-east-williamsburg-road.yml b/data/cities/sandston/7-eleven-east-williamsburg-road.yml
deleted file mode 100644
index 00721f0e8..000000000
--- a/data/cities/sandston/7-eleven-east-williamsburg-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 708697941
-type: node
-latitude: 37.51985
-longitude: -77.30299
-postcode: "23150"
-city: Sandston
-street: East Williamsburg Road
-housenumber: "389"
-phone: ""
-opening_hours: 24/7
-website: ""
diff --git a/data/cities/sandston/7-eleven-south-airport-drive.yml b/data/cities/sandston/7-eleven-south-airport-drive.yml
new file mode 100644
index 000000000..3ba5d7626
--- /dev/null
+++ b/data/cities/sandston/7-eleven-south-airport-drive.yml
@@ -0,0 +1,11 @@
+id: 710440911
+type: node
+latitude: 37.52447
+longitude: -77.32749
+postcode: "23150"
+city: Sandston
+street: South Airport Drive
+housenumber: "501"
+phone: +1 804-737-0266
+opening_hours: ""
+website: https://www.7-eleven.com/locations/va/sandston/501-s-airport-dr-39727
diff --git a/data/cities/sandston/7-eleven.yml b/data/cities/sandston/7-eleven.yml
index 3ba5d7626..00721f0e8 100644
--- a/data/cities/sandston/7-eleven.yml
+++ b/data/cities/sandston/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 710440911
+id: 708697941
 type: node
-latitude: 37.52447
-longitude: -77.32749
+latitude: 37.51985
+longitude: -77.30299
 postcode: "23150"
 city: Sandston
-street: South Airport Drive
-housenumber: "501"
-phone: +1 804-737-0266
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/sandston/501-s-airport-dr-39727
+street: East Williamsburg Road
+housenumber: "389"
+phone: ""
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/smithfield/dollar-general-south-church-street.yml b/data/cities/smithfield/dollar-general-south-church-street.yml
new file mode 100644
index 000000000..be8f2530b
--- /dev/null
+++ b/data/cities/smithfield/dollar-general-south-church-street.yml
@@ -0,0 +1,11 @@
+id: 922876113
+type: node
+latitude: 36.97172
+longitude: -76.60888
+postcode: "23430"
+city: Smithfield
+street: South Church Street
+housenumber: "1205"
+phone: +1-757-356-2018
+opening_hours: Mo-Su 08:00-10:00
+website: https://www.dollargeneral.com/store-directory/va/smithfield/3014
diff --git a/data/cities/smithfield/dollar-general-west-main-street.yml b/data/cities/smithfield/dollar-general-west-main-street.yml
deleted file mode 100644
index 3825917c0..000000000
--- a/data/cities/smithfield/dollar-general-west-main-street.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 926646100
-type: node
-latitude: 36.97551
-longitude: -76.64421
-postcode: "23430"
-city: Smithfield
-street: West Main Street
-housenumber: "651"
-phone: ""
-opening_hours: ""
-website: https://www.dollargeneral.com/store-directory/va/smithfield/15191
diff --git a/data/cities/smithfield/dollar-general.yml b/data/cities/smithfield/dollar-general.yml
index be8f2530b..3825917c0 100644
--- a/data/cities/smithfield/dollar-general.yml
+++ b/data/cities/smithfield/dollar-general.yml
@@ -1,11 +1,11 @@
-id: 922876113
+id: 926646100
 type: node
-latitude: 36.97172
-longitude: -76.60888
+latitude: 36.97551
+longitude: -76.64421
 postcode: "23430"
 city: Smithfield
-street: South Church Street
-housenumber: "1205"
-phone: +1-757-356-2018
-opening_hours: Mo-Su 08:00-10:00
-website: https://www.dollargeneral.com/store-directory/va/smithfield/3014
+street: West Main Street
+housenumber: "651"
+phone: ""
+opening_hours: ""
+website: https://www.dollargeneral.com/store-directory/va/smithfield/15191
diff --git a/data/cities/south-boston/blue-ridge-tobacco-and-candle.yml b/data/cities/south-boston/blue-ridge-tobacco-and-candle.yml
new file mode 100644
index 000000000..1a91e7104
--- /dev/null
+++ b/data/cities/south-boston/blue-ridge-tobacco-and-candle.yml
@@ -0,0 +1,11 @@
+id: 12403540373
+type: node
+latitude: 36.68647
+longitude: -78.89667
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1024"
+phone: +1-434-572-2860
+opening_hours: Mo 09:00-19:00; Tu0Fr 08:00-19:00; Sa 09:00-18:00
+website: ""
diff --git a/data/cities/south-boston/cricket-wireless.yml b/data/cities/south-boston/cricket-wireless.yml
new file mode 100644
index 000000000..683b3aa9a
--- /dev/null
+++ b/data/cities/south-boston/cricket-wireless.yml
@@ -0,0 +1,11 @@
+id: 12403540375
+type: node
+latitude: 36.6863
+longitude: -78.89765
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1020"
+phone: +1-434-272-2373
+opening_hours: Mo-Sa 09:00-20:00; Su 11:00-18:00
+website: ""
diff --git a/data/cities/south-boston/dollar-general.yml b/data/cities/south-boston/dollar-general.yml
index 8f7f3ea88..eb4d76c59 100644
--- a/data/cities/south-boston/dollar-general.yml
+++ b/data/cities/south-boston/dollar-general.yml
@@ -1,11 +1,11 @@
 id: 5497869341
 type: node
-latitude: 36.68628
-longitude: -78.89772
+latitude: 36.68647
+longitude: -78.89636
 postcode: 24592-7134
 city: South Boston
-street: ""
-housenumber: ""
+street: Bill Tuck Highway
+housenumber: "1030"
 phone: +1 434-608-0550
 opening_hours: Mo-Su 08:00-22:00
 website: https://www.dollargeneral.com/store-directory/va/south-boston/4238
diff --git a/data/cities/south-boston/food-lion.yml b/data/cities/south-boston/food-lion.yml
new file mode 100644
index 000000000..0205a07dd
--- /dev/null
+++ b/data/cities/south-boston/food-lion.yml
@@ -0,0 +1,11 @@
+id: 1096436196
+type: node
+latitude: 36.68634
+longitude: -78.89723
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1020"
+phone: +1-434-572-1960
+opening_hours: Mo-Su 07:00-23:00
+website: ""
diff --git a/data/cities/south-boston/new-york-fashion.yml b/data/cities/south-boston/new-york-fashion.yml
new file mode 100644
index 000000000..c8b7a9676
--- /dev/null
+++ b/data/cities/south-boston/new-york-fashion.yml
@@ -0,0 +1,11 @@
+id: 12403540377
+type: node
+latitude: 36.68626
+longitude: -78.89809
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1020"
+phone: +1-434-575-1949
+opening_hours: Mo-Fr 09:30-18:00; Sa 10:00-17:00
+website: ""
diff --git a/data/cities/south-boston/reaves-trophy-shop.yml b/data/cities/south-boston/reaves-trophy-shop.yml
new file mode 100644
index 000000000..8aecdc424
--- /dev/null
+++ b/data/cities/south-boston/reaves-trophy-shop.yml
@@ -0,0 +1,11 @@
+id: 5497869152
+type: node
+latitude: 36.68627
+longitude: -78.89785
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1020"
+phone: +1-434-572-6886
+opening_hours: Mo-Fr 09:00-17:00; Sa 10:00-16:00
+website: https://www.reavestrophyshop.com/
diff --git a/data/cities/south-boston/riverdale-laundry-land-laundromat.yml b/data/cities/south-boston/riverdale-laundry-land-laundromat.yml
new file mode 100644
index 000000000..86fb1f3c7
--- /dev/null
+++ b/data/cities/south-boston/riverdale-laundry-land-laundromat.yml
@@ -0,0 +1,11 @@
+id: 12403540378
+type: node
+latitude: 36.68623
+longitude: -78.89821
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1020"
+phone: +1-434-793-2011
+opening_hours: Mo-Su 07:00-21:00
+website: ""
diff --git a/data/cities/south-boston/smileys-general-merchandise.yml b/data/cities/south-boston/smileys-general-merchandise.yml
new file mode 100644
index 000000000..e94a376ff
--- /dev/null
+++ b/data/cities/south-boston/smileys-general-merchandise.yml
@@ -0,0 +1,11 @@
+id: 12403545471
+type: node
+latitude: 36.67133
+longitude: -78.81107
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "6046"
+phone: +1-434-572-4017
+opening_hours: Mo-Sa 07:00-21:00; Su 08:00-20:00
+website: ""
diff --git a/data/cities/south-boston/smokers-vape-plus.yml b/data/cities/south-boston/smokers-vape-plus.yml
new file mode 100644
index 000000000..300be571f
--- /dev/null
+++ b/data/cities/south-boston/smokers-vape-plus.yml
@@ -0,0 +1,11 @@
+id: 12403540376
+type: node
+latitude: 36.68627
+longitude: -78.898
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1020"
+phone: +1-434-404-3623
+opening_hours: Mo-Sa 09:00-21:00; Su 10:00-18:00
+website: ""
diff --git a/data/cities/south-boston/va-nails.yml b/data/cities/south-boston/va-nails.yml
new file mode 100644
index 000000000..21cbe89bc
--- /dev/null
+++ b/data/cities/south-boston/va-nails.yml
@@ -0,0 +1,11 @@
+id: 5497869151
+type: node
+latitude: 36.68626
+longitude: -78.89791
+postcode: "24592"
+city: South Boston
+street: Bill Tuck Highway
+housenumber: "1020"
+phone: +1-434-575-8843
+opening_hours: Mo-Sa 09:00-19:30; Su 10:00-18:00
+website: ""
diff --git a/data/cities/stafford/aldi.yml b/data/cities/stafford/aldi.yml
index 502808cb3..7483adb01 100644
--- a/data/cities/stafford/aldi.yml
+++ b/data/cities/stafford/aldi.yml
@@ -1,7 +1,7 @@
-id: 8735409095
+id: 1340630219
 type: node
-latitude: 38.47326
-longitude: -77.4194
+latitude: 38.4733
+longitude: -77.41925
 postcode: 22554-1550
 city: Stafford
 street: Garrisonville Road
diff --git a/data/cities/stafford/harbor-freight-tools.yml b/data/cities/stafford/harbor-freight-tools.yml
index 6d8103976..8099b9769 100644
--- a/data/cities/stafford/harbor-freight-tools.yml
+++ b/data/cities/stafford/harbor-freight-tools.yml
@@ -1,7 +1,7 @@
-id: 12050368541
+id: 1340630218
 type: node
-latitude: 38.47318
-longitude: -77.41915
+latitude: 38.47283
+longitude: -77.41949
 postcode: "22554"
 city: Stafford
 street: Garrisonville Road
diff --git a/data/cities/stafford/the-icing-baking-company.yml b/data/cities/stafford/the-icing-baking-company.yml
index 6f71a7812..0d5f3fedb 100644
--- a/data/cities/stafford/the-icing-baking-company.yml
+++ b/data/cities/stafford/the-icing-baking-company.yml
@@ -1,7 +1,7 @@
-id: 9273494164
+id: 1340634673
 type: node
-latitude: 38.47337
-longitude: -77.41742
+latitude: 38.47317
+longitude: -77.41735
 postcode: "22554"
 city: Stafford
 street: Garrisonville Road
diff --git a/data/cities/stafford/wawa-austin-park-drive.yml b/data/cities/stafford/wawa-austin-park-drive.yml
deleted file mode 100644
index e2476d932..000000000
--- a/data/cities/stafford/wawa-austin-park-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 229732179
-type: node
-latitude: 38.44971
-longitude: -77.40382
-postcode: 22554-8461
-city: Stafford
-street: Austin Park Drive
-housenumber: "72"
-phone: +1 540-288-0655
-opening_hours: 24/7
-website: https://www.wawa.com/locations/665
diff --git a/data/cities/stafford/wawa-eustace-road.yml b/data/cities/stafford/wawa-eustace-road.yml
new file mode 100644
index 000000000..2b2f4d98c
--- /dev/null
+++ b/data/cities/stafford/wawa-eustace-road.yml
@@ -0,0 +1,11 @@
+id: 1069447500
+type: node
+latitude: 38.47321
+longitude: -77.43624
+postcode: 22554-3717
+city: Stafford
+street: Eustace Road
+housenumber: "15"
+phone: +1 540-288-2057
+opening_hours: 24/7
+website: https://www.wawa.com/locations/689
diff --git a/data/cities/stafford/wawa.yml b/data/cities/stafford/wawa.yml
index b03f69046..e2476d932 100644
--- a/data/cities/stafford/wawa.yml
+++ b/data/cities/stafford/wawa.yml
@@ -1,11 +1,11 @@
-id: 825443043
+id: 229732179
 type: node
-latitude: 38.47323
-longitude: -77.43606
-postcode: 22554-3717
+latitude: 38.44971
+longitude: -77.40382
+postcode: 22554-8461
 city: Stafford
-street: Eustace Road
-housenumber: "15"
-phone: +1 540-288-2057
+street: Austin Park Drive
+housenumber: "72"
+phone: +1 540-288-0655
 opening_hours: 24/7
-website: https://www.wawa.com/locations/689
+website: https://www.wawa.com/locations/665
diff --git a/data/cities/sterling/massage-pros.yml b/data/cities/sterling/massage-pros.yml
index 8722a03fc..d8a3a1ce9 100644
--- a/data/cities/sterling/massage-pros.yml
+++ b/data/cities/sterling/massage-pros.yml
@@ -7,5 +7,5 @@ city: Sterling
 street: Leesburg Pike
 housenumber: "47028"
 phone: +1 571-313-5090
-opening_hours: Mo-Sa 10:00 AM - 8:00 PM; Su 11:00 AM - 8:00 PM
+opening_hours: Mo-Sa 10:00-20:00; Su 11:00-20:00
 website: https://www.massageprosus.com/
diff --git a/data/cities/suffolk/dollar-general-godwin-boulevard.yml b/data/cities/suffolk/dollar-general-godwin-boulevard.yml
deleted file mode 100644
index 1a32ccedd..000000000
--- a/data/cities/suffolk/dollar-general-godwin-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 383908106
-type: node
-latitude: 36.85791
-longitude: -76.58156
-postcode: "23432"
-city: Suffolk
-street: Godwin Boulevard
-housenumber: "5900"
-phone: ""
-opening_hours: ""
-website: https://www.dollargeneral.com/store-directory/va/suffolk/16791
diff --git a/data/cities/suffolk/dollar-general-wilroy-road.yml b/data/cities/suffolk/dollar-general-wilroy-road.yml
new file mode 100644
index 000000000..9618350f7
--- /dev/null
+++ b/data/cities/suffolk/dollar-general-wilroy-road.yml
@@ -0,0 +1,11 @@
+id: 384012067
+type: node
+latitude: 36.75076
+longitude: -76.56194
+postcode: "23434"
+city: Suffolk
+street: Wilroy Road
+housenumber: "1226"
+phone: ""
+opening_hours: ""
+website: https://www.dollargeneral.com/store-directory/va/suffolk/14407
diff --git a/data/cities/suffolk/dollar-general.yml b/data/cities/suffolk/dollar-general.yml
index 9618350f7..1a32ccedd 100644
--- a/data/cities/suffolk/dollar-general.yml
+++ b/data/cities/suffolk/dollar-general.yml
@@ -1,11 +1,11 @@
-id: 384012067
+id: 383908106
 type: node
-latitude: 36.75076
-longitude: -76.56194
-postcode: "23434"
+latitude: 36.85791
+longitude: -76.58156
+postcode: "23432"
 city: Suffolk
-street: Wilroy Road
-housenumber: "1226"
+street: Godwin Boulevard
+housenumber: "5900"
 phone: ""
 opening_hours: ""
-website: https://www.dollargeneral.com/store-directory/va/suffolk/14407
+website: https://www.dollargeneral.com/store-directory/va/suffolk/16791
diff --git a/data/cities/vienna/7-eleven-leesburg-pike-2.yml b/data/cities/vienna/7-eleven-leesburg-pike-2.yml
deleted file mode 100644
index c559a08a3..000000000
--- a/data/cities/vienna/7-eleven-leesburg-pike-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5249671329
-type: node
-latitude: 38.92272
-longitude: -77.23723
-postcode: 22182-2402
-city: Vienna
-street: Leesburg Pike
-housenumber: "8391"
-phone: +1 703-760-0979
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/vienna/8391-leesburg-pike-28556
diff --git a/data/cities/vienna/7-eleven-leesburg-pike.yml b/data/cities/vienna/7-eleven-leesburg-pike.yml
index 0854948c4..c559a08a3 100644
--- a/data/cities/vienna/7-eleven-leesburg-pike.yml
+++ b/data/cities/vienna/7-eleven-leesburg-pike.yml
@@ -1,11 +1,11 @@
-id: 599308053
+id: 5249671329
 type: node
-latitude: 38.97626
-longitude: -77.30919
-postcode: 22182-1333
+latitude: 38.92272
+longitude: -77.23723
+postcode: 22182-2402
 city: Vienna
 street: Leesburg Pike
-housenumber: "10508"
-phone: +1 703-759-5833
+housenumber: "8391"
+phone: +1 703-760-0979
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/vienna/10508-leesburg-pke-10671
+website: https://www.7-eleven.com/locations/va/vienna/8391-leesburg-pike-28556
diff --git a/data/cities/vienna/7-eleven-park-street-southeast.yml b/data/cities/vienna/7-eleven-park-street-southeast.yml
new file mode 100644
index 000000000..d0e20fd68
--- /dev/null
+++ b/data/cities/vienna/7-eleven-park-street-southeast.yml
@@ -0,0 +1,11 @@
+id: 661442017
+type: node
+latitude: 38.88877
+longitude: -77.24283
+postcode: 22180-6842
+city: Vienna
+street: Park Street Southeast
+housenumber: "8616"
+phone: +1 703-876-8921
+opening_hours: ""
+website: https://www.7-eleven.com/locations/va/vienna/8616-park-st-10693
diff --git a/data/cities/vienna/7-eleven.yml b/data/cities/vienna/7-eleven.yml
index d0e20fd68..0854948c4 100644
--- a/data/cities/vienna/7-eleven.yml
+++ b/data/cities/vienna/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 661442017
+id: 599308053
 type: node
-latitude: 38.88877
-longitude: -77.24283
-postcode: 22180-6842
+latitude: 38.97626
+longitude: -77.30919
+postcode: 22182-1333
 city: Vienna
-street: Park Street Southeast
-housenumber: "8616"
-phone: +1 703-876-8921
+street: Leesburg Pike
+housenumber: "10508"
+phone: +1 703-759-5833
 opening_hours: ""
-website: https://www.7-eleven.com/locations/va/vienna/8616-park-st-10693
+website: https://www.7-eleven.com/locations/va/vienna/10508-leesburg-pke-10671
diff --git a/data/cities/virginia-beach/7-eleven-3.yml b/data/cities/virginia-beach/7-eleven-3.yml
index f2a5fc767..11585fa8e 100644
--- a/data/cities/virginia-beach/7-eleven-3.yml
+++ b/data/cities/virginia-beach/7-eleven-3.yml
@@ -1,8 +1,8 @@
-id: 402380929
+id: 402511480
 type: node
-latitude: 36.84879
-longitude: -76.02918
-postcode: "23454"
+latitude: 36.8127
+longitude: -76.06831
+postcode: "23452"
 city: Virginia Beach
 street: ""
 housenumber: ""
diff --git a/data/cities/virginia-beach/7-eleven-4.yml b/data/cities/virginia-beach/7-eleven-4.yml
index 11585fa8e..f2a5fc767 100644
--- a/data/cities/virginia-beach/7-eleven-4.yml
+++ b/data/cities/virginia-beach/7-eleven-4.yml
@@ -1,8 +1,8 @@
-id: 402511480
+id: 402380929
 type: node
-latitude: 36.8127
-longitude: -76.06831
-postcode: "23452"
+latitude: 36.84879
+longitude: -76.02918
+postcode: "23454"
 city: Virginia Beach
 street: ""
 housenumber: ""
diff --git a/data/cities/virginia-beach/7-eleven-5.yml b/data/cities/virginia-beach/7-eleven-5.yml
index 90623cf2e..398b94b83 100644
--- a/data/cities/virginia-beach/7-eleven-5.yml
+++ b/data/cities/virginia-beach/7-eleven-5.yml
@@ -1,8 +1,8 @@
-id: 402724375
+id: 402663368
 type: node
-latitude: 36.7898
-longitude: -76.12448
-postcode: "23456"
+latitude: 36.81929
+longitude: -76.22268
+postcode: "23464"
 city: Virginia Beach
 street: ""
 housenumber: ""
diff --git a/data/cities/virginia-beach/7-eleven-6.yml b/data/cities/virginia-beach/7-eleven-6.yml
index 3cb7467a2..90623cf2e 100644
--- a/data/cities/virginia-beach/7-eleven-6.yml
+++ b/data/cities/virginia-beach/7-eleven-6.yml
@@ -1,8 +1,8 @@
-id: 402688160
+id: 402724375
 type: node
-latitude: 36.79649
-longitude: -76.17468
-postcode: "23464"
+latitude: 36.7898
+longitude: -76.12448
+postcode: "23456"
 city: Virginia Beach
 street: ""
 housenumber: ""
diff --git a/data/cities/virginia-beach/7-eleven-7.yml b/data/cities/virginia-beach/7-eleven-7.yml
index 398b94b83..3cb7467a2 100644
--- a/data/cities/virginia-beach/7-eleven-7.yml
+++ b/data/cities/virginia-beach/7-eleven-7.yml
@@ -1,7 +1,7 @@
-id: 402663368
+id: 402688160
 type: node
-latitude: 36.81929
-longitude: -76.22268
+latitude: 36.79649
+longitude: -76.17468
 postcode: "23464"
 city: Virginia Beach
 street: ""
diff --git a/data/cities/virginia-beach/7-eleven-holland-road-2.yml b/data/cities/virginia-beach/7-eleven-holland-road-2.yml
index 529fbe1f8..14d50c123 100644
--- a/data/cities/virginia-beach/7-eleven-holland-road-2.yml
+++ b/data/cities/virginia-beach/7-eleven-holland-road-2.yml
@@ -1,11 +1,11 @@
-id: 402466613
+id: 402513653
 type: node
-latitude: 36.81673
-longitude: -76.11189
-postcode: "23452"
+latitude: 36.79144
+longitude: -76.08105
+postcode: "23453"
 city: Virginia Beach
 street: Holland Road
-housenumber: "3964"
-phone: +1-757-463-6690
-opening_hours: 24/7
+housenumber: "3185"
+phone: ""
+opening_hours: ""
 website: ""
diff --git a/data/cities/virginia-beach/7-eleven-holland-road-3.yml b/data/cities/virginia-beach/7-eleven-holland-road-3.yml
index 14d50c123..1a713fc4a 100644
--- a/data/cities/virginia-beach/7-eleven-holland-road-3.yml
+++ b/data/cities/virginia-beach/7-eleven-holland-road-3.yml
@@ -1,11 +1,11 @@
-id: 402513653
+id: 402513988
 type: node
-latitude: 36.79144
-longitude: -76.08105
-postcode: "23453"
+latitude: 36.80136
+longitude: -76.08621
+postcode: "23452"
 city: Virginia Beach
 street: Holland Road
-housenumber: "3185"
-phone: ""
+housenumber: "3312"
+phone: +1 757-427-6509
 opening_hours: ""
-website: ""
+website: https://www.7-eleven.com/locations/va/virginia-beach/3312-holland-rd-10912
diff --git a/data/cities/virginia-beach/7-eleven-holland-road-4.yml b/data/cities/virginia-beach/7-eleven-holland-road-4.yml
index 1a713fc4a..529fbe1f8 100644
--- a/data/cities/virginia-beach/7-eleven-holland-road-4.yml
+++ b/data/cities/virginia-beach/7-eleven-holland-road-4.yml
@@ -1,11 +1,11 @@
-id: 402513988
+id: 402466613
 type: node
-latitude: 36.80136
-longitude: -76.08621
+latitude: 36.81673
+longitude: -76.11189
 postcode: "23452"
 city: Virginia Beach
 street: Holland Road
-housenumber: "3312"
-phone: +1 757-427-6509
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/virginia-beach/3312-holland-rd-10912
+housenumber: "3964"
+phone: +1-757-463-6690
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/virginia-beach/7-eleven-princess-anne-road-2.yml b/data/cities/virginia-beach/7-eleven-princess-anne-road-2.yml
index 26f97dc3e..a3bacb9b8 100644
--- a/data/cities/virginia-beach/7-eleven-princess-anne-road-2.yml
+++ b/data/cities/virginia-beach/7-eleven-princess-anne-road-2.yml
@@ -1,11 +1,11 @@
-id: 402551158
+id: 402572029
 type: node
-latitude: 36.7598
-longitude: -76.01912
+latitude: 36.72044
+longitude: -76.01969
 postcode: "23456"
 city: Virginia Beach
 street: Princess Anne Road
-housenumber: "2205"
+housenumber: "1765"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/virginia-beach/7-eleven-princess-anne-road.yml b/data/cities/virginia-beach/7-eleven-princess-anne-road.yml
index a3bacb9b8..26f97dc3e 100644
--- a/data/cities/virginia-beach/7-eleven-princess-anne-road.yml
+++ b/data/cities/virginia-beach/7-eleven-princess-anne-road.yml
@@ -1,11 +1,11 @@
-id: 402572029
+id: 402551158
 type: node
-latitude: 36.72044
-longitude: -76.01969
+latitude: 36.7598
+longitude: -76.01912
 postcode: "23456"
 city: Virginia Beach
 street: Princess Anne Road
-housenumber: "1765"
+housenumber: "2205"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard-2.yml b/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard-2.yml
index c01d9b226..cb4db2ebb 100644
--- a/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard-2.yml
+++ b/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard-2.yml
@@ -1,11 +1,11 @@
-id: 402408976
+id: 402438862
 type: node
-latitude: 36.84523
-longitude: -75.97595
-postcode: "23451"
+latitude: 36.83975
+longitude: -76.09839
+postcode: "23452"
 city: Virginia Beach
 street: Virginia Beach Boulevard
-housenumber: "300"
-phone: +1 757-491-1017
-opening_hours: ""
-website: https://www.7-eleven.com/locations/va/virginia-beach/300-virginia-beach-blvd-24186
+housenumber: "3673"
+phone: +1-757-335-0392
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard.yml b/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard.yml
index cb4db2ebb..c01d9b226 100644
--- a/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard.yml
+++ b/data/cities/virginia-beach/7-eleven-virginia-beach-boulevard.yml
@@ -1,11 +1,11 @@
-id: 402438862
+id: 402408976
 type: node
-latitude: 36.83975
-longitude: -76.09839
-postcode: "23452"
+latitude: 36.84523
+longitude: -75.97595
+postcode: "23451"
 city: Virginia Beach
 street: Virginia Beach Boulevard
-housenumber: "3673"
-phone: +1-757-335-0392
-opening_hours: 24/7
-website: ""
+housenumber: "300"
+phone: +1 757-491-1017
+opening_hours: ""
+website: https://www.7-eleven.com/locations/va/virginia-beach/300-virginia-beach-blvd-24186
diff --git a/data/cities/virginia-beach/food-lion-holland-road.yml b/data/cities/virginia-beach/food-lion-holland-road.yml
new file mode 100644
index 000000000..323f768a0
--- /dev/null
+++ b/data/cities/virginia-beach/food-lion-holland-road.yml
@@ -0,0 +1,11 @@
+id: 12335572512
+type: node
+latitude: 36.822
+longitude: -76.12212
+postcode: "23452"
+city: Virginia Beach
+street: Holland Road
+housenumber: "4392"
+phone: +1-757-631-6400
+opening_hours: Mo-Su 07:00-23:00
+website: ""
diff --git a/data/cities/virginia-beach/food-lion-north-great-neck-road.yml b/data/cities/virginia-beach/food-lion-north-great-neck-road.yml
deleted file mode 100644
index 7f3485280..000000000
--- a/data/cities/virginia-beach/food-lion-north-great-neck-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 12288729818
-type: node
-latitude: 36.87739
-longitude: -76.03913
-postcode: "23454"
-city: Virginia Beach
-street: North Great Neck Road
-housenumber: "1340"
-phone: +1-757-481-1584
-opening_hours: Su-Fr 06:00-23:00; Sa 06:30-23:00
-website: ""
diff --git a/data/cities/virginia-beach/food-lion.yml b/data/cities/virginia-beach/food-lion.yml
index 323f768a0..7f3485280 100644
--- a/data/cities/virginia-beach/food-lion.yml
+++ b/data/cities/virginia-beach/food-lion.yml
@@ -1,11 +1,11 @@
-id: 12335572512
+id: 12288729818
 type: node
-latitude: 36.822
-longitude: -76.12212
-postcode: "23452"
+latitude: 36.87739
+longitude: -76.03913
+postcode: "23454"
 city: Virginia Beach
-street: Holland Road
-housenumber: "4392"
-phone: +1-757-631-6400
-opening_hours: Mo-Su 07:00-23:00
+street: North Great Neck Road
+housenumber: "1340"
+phone: +1-757-481-1584
+opening_hours: Su-Fr 06:00-23:00; Sa 06:30-23:00
 website: ""
diff --git a/data/cities/virginia-beach/harris-teeter-2.yml b/data/cities/virginia-beach/harris-teeter-2.yml
index 0b30357c4..ea31b4e73 100644
--- a/data/cities/virginia-beach/harris-teeter-2.yml
+++ b/data/cities/virginia-beach/harris-teeter-2.yml
@@ -1,11 +1,11 @@
-id: 8238327716
+id: 8203081357
 type: node
-latitude: 36.80707
-longitude: -76.13248
-postcode: "23462"
+latitude: 36.75164
+longitude: -76.01179
+postcode: "23456"
 city: Virginia Beach
 street: ""
 housenumber: ""
-phone: +1 757-467-4387
+phone: +1 757-721-2672
 opening_hours: Mo-Su 06:00-22:00
-website: https://www.harristeeter.com/stores/grocery/va/virginia-beach/brenneman-farm/097/00369
+website: https://www.harristeeter.com/stores/grocery/va/virginia-beach/sandbridge-commons/097/00419
diff --git a/data/cities/virginia-beach/harris-teeter-3.yml b/data/cities/virginia-beach/harris-teeter-3.yml
index ea31b4e73..0b30357c4 100644
--- a/data/cities/virginia-beach/harris-teeter-3.yml
+++ b/data/cities/virginia-beach/harris-teeter-3.yml
@@ -1,11 +1,11 @@
-id: 8203081357
+id: 8238327716
 type: node
-latitude: 36.75164
-longitude: -76.01179
-postcode: "23456"
+latitude: 36.80707
+longitude: -76.13248
+postcode: "23462"
 city: Virginia Beach
 street: ""
 housenumber: ""
-phone: +1 757-721-2672
+phone: +1 757-467-4387
 opening_hours: Mo-Su 06:00-22:00
-website: https://www.harristeeter.com/stores/grocery/va/virginia-beach/sandbridge-commons/097/00419
+website: https://www.harristeeter.com/stores/grocery/va/virginia-beach/brenneman-farm/097/00369
diff --git a/data/cities/virginia-beach/kroger-shore-drive.yml b/data/cities/virginia-beach/kroger-shore-drive.yml
new file mode 100644
index 000000000..6cfb4c119
--- /dev/null
+++ b/data/cities/virginia-beach/kroger-shore-drive.yml
@@ -0,0 +1,11 @@
+id: 402213646
+type: node
+latitude: 36.90287
+longitude: -76.13016
+postcode: "23455"
+city: Virginia Beach
+street: Shore Drive
+housenumber: "4625"
+phone: +1 757-460-1674
+opening_hours: Mo-Fr 08:00-20:00;Sa 09:00-18:00;Su 10:00-17:00
+website: https://www.kroger.com/stores/grocery/va/virginia-beach/shore-drive/029/00532
diff --git a/data/cities/virginia-beach/kroger-virginia-beach-boulevard.yml b/data/cities/virginia-beach/kroger-virginia-beach-boulevard.yml
deleted file mode 100644
index 8a0e22ab9..000000000
--- a/data/cities/virginia-beach/kroger-virginia-beach-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 402279058
-type: node
-latitude: 36.84448
-longitude: -76.08817
-postcode: "23452"
-city: Virginia Beach
-street: Virginia Beach Boulevard
-housenumber: "3330"
-phone: +1 757-486-0040
-opening_hours: Mo-Su 06:00-23:00
-website: https://www.kroger.com/stores/grocery/va/virginia-beach/kroger-king-richard/029/00539
diff --git a/data/cities/virginia-beach/kroger.yml b/data/cities/virginia-beach/kroger.yml
index 6cfb4c119..8a0e22ab9 100644
--- a/data/cities/virginia-beach/kroger.yml
+++ b/data/cities/virginia-beach/kroger.yml
@@ -1,11 +1,11 @@
-id: 402213646
+id: 402279058
 type: node
-latitude: 36.90287
-longitude: -76.13016
-postcode: "23455"
+latitude: 36.84448
+longitude: -76.08817
+postcode: "23452"
 city: Virginia Beach
-street: Shore Drive
-housenumber: "4625"
-phone: +1 757-460-1674
-opening_hours: Mo-Fr 08:00-20:00;Sa 09:00-18:00;Su 10:00-17:00
-website: https://www.kroger.com/stores/grocery/va/virginia-beach/shore-drive/029/00532
+street: Virginia Beach Boulevard
+housenumber: "3330"
+phone: +1 757-486-0040
+opening_hours: Mo-Su 06:00-23:00
+website: https://www.kroger.com/stores/grocery/va/virginia-beach/kroger-king-richard/029/00539
diff --git a/data/cities/virginia-beach/rite-aid-south-rosemont-road.yml b/data/cities/virginia-beach/rite-aid-south-rosemont-road.yml
new file mode 100644
index 000000000..191e77b43
--- /dev/null
+++ b/data/cities/virginia-beach/rite-aid-south-rosemont-road.yml
@@ -0,0 +1,11 @@
+id: 402456872
+type: node
+latitude: 36.8013
+longitude: -76.10013
+postcode: "23452"
+city: Virginia Beach
+street: South Rosemont Road
+housenumber: "1177"
+phone: +1-757-486-4427
+opening_hours: Mo-Fr 09:00-21:00; Sa-Su 09:00-20:00
+website: ""
diff --git a/data/cities/virginia-beach/rite-aid-upton-drive.yml b/data/cities/virginia-beach/rite-aid-upton-drive.yml
deleted file mode 100644
index 1c6aaa9df..000000000
--- a/data/cities/virginia-beach/rite-aid-upton-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 402555804
-type: node
-latitude: 36.75334
-longitude: -76.00959
-postcode: "23456"
-city: Virginia Beach
-street: Upton Drive
-housenumber: "2293"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/virginia-beach/rite-aid.yml b/data/cities/virginia-beach/rite-aid.yml
index 191e77b43..1c6aaa9df 100644
--- a/data/cities/virginia-beach/rite-aid.yml
+++ b/data/cities/virginia-beach/rite-aid.yml
@@ -1,11 +1,11 @@
-id: 402456872
+id: 402555804
 type: node
-latitude: 36.8013
-longitude: -76.10013
-postcode: "23452"
+latitude: 36.75334
+longitude: -76.00959
+postcode: "23456"
 city: Virginia Beach
-street: South Rosemont Road
-housenumber: "1177"
-phone: +1-757-486-4427
-opening_hours: Mo-Fr 09:00-21:00; Sa-Su 09:00-20:00
+street: Upton Drive
+housenumber: "2293"
+phone: ""
+opening_hours: ""
 website: ""
diff --git a/data/cities/virginia-beach/verizon-independence-boulevard.yml b/data/cities/virginia-beach/verizon-independence-boulevard.yml
deleted file mode 100644
index 64f9823ec..000000000
--- a/data/cities/virginia-beach/verizon-independence-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 402255769
-type: node
-latitude: 36.8735
-longitude: -76.13397
-postcode: "23455"
-city: Virginia Beach
-street: Independence Boulevard
-housenumber: "1048"
-phone: +1-757-309-4342
-opening_hours: Mo-Sa 09:00-20:00; Su 12:00-18:00
-website: ""
diff --git a/data/cities/virginia-beach/verizon-virginia-beach-boulevard.yml b/data/cities/virginia-beach/verizon-virginia-beach-boulevard.yml
new file mode 100644
index 000000000..d722b452d
--- /dev/null
+++ b/data/cities/virginia-beach/verizon-virginia-beach-boulevard.yml
@@ -0,0 +1,11 @@
+id: 402428601
+type: node
+latitude: 36.84197
+longitude: -76.11297
+postcode: "23452"
+city: Virginia Beach
+street: Virginia Beach Boulevard
+housenumber: "3996"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/virginia-beach/verizon.yml b/data/cities/virginia-beach/verizon.yml
index d722b452d..64f9823ec 100644
--- a/data/cities/virginia-beach/verizon.yml
+++ b/data/cities/virginia-beach/verizon.yml
@@ -1,11 +1,11 @@
-id: 402428601
+id: 402255769
 type: node
-latitude: 36.84197
-longitude: -76.11297
-postcode: "23452"
+latitude: 36.8735
+longitude: -76.13397
+postcode: "23455"
 city: Virginia Beach
-street: Virginia Beach Boulevard
-housenumber: "3996"
-phone: ""
-opening_hours: ""
+street: Independence Boulevard
+housenumber: "1048"
+phone: +1-757-309-4342
+opening_hours: Mo-Sa 09:00-20:00; Su 12:00-18:00
 website: ""
diff --git a/data/cities/virginia-beach/wawa-virginia-beach-boulevard-2.yml b/data/cities/virginia-beach/wawa-virginia-beach-boulevard-2.yml
index 7924e0228..2e119df93 100644
--- a/data/cities/virginia-beach/wawa-virginia-beach-boulevard-2.yml
+++ b/data/cities/virginia-beach/wawa-virginia-beach-boulevard-2.yml
@@ -1,11 +1,11 @@
-id: 402279672
+id: 402376370
 type: node
-latitude: 36.8446
-longitude: -76.0745
-postcode: "23452"
+latitude: 36.84326
+longitude: -76.02182
+postcode: "23454"
 city: Virginia Beach
 street: Virginia Beach Boulevard
-housenumber: "2954"
-phone: +1 757-340-2615
+housenumber: "1700"
+phone: +1 757-422-6300
 opening_hours: 24/7
-website: https://www.wawa.com/locations/694
+website: https://www.wawa.com/locations/8608
diff --git a/data/cities/virginia-beach/wawa-virginia-beach-boulevard.yml b/data/cities/virginia-beach/wawa-virginia-beach-boulevard.yml
index 2e119df93..7924e0228 100644
--- a/data/cities/virginia-beach/wawa-virginia-beach-boulevard.yml
+++ b/data/cities/virginia-beach/wawa-virginia-beach-boulevard.yml
@@ -1,11 +1,11 @@
-id: 402376370
+id: 402279672
 type: node
-latitude: 36.84326
-longitude: -76.02182
-postcode: "23454"
+latitude: 36.8446
+longitude: -76.0745
+postcode: "23452"
 city: Virginia Beach
 street: Virginia Beach Boulevard
-housenumber: "1700"
-phone: +1 757-422-6300
+housenumber: "2954"
+phone: +1 757-340-2615
 opening_hours: 24/7
-website: https://www.wawa.com/locations/8608
+website: https://www.wawa.com/locations/694
diff --git a/data/cities/woodbridge/joy-day-spa.yml b/data/cities/woodbridge/joy-day-spa.yml
new file mode 100644
index 000000000..151f6fd16
--- /dev/null
+++ b/data/cities/woodbridge/joy-day-spa.yml
@@ -0,0 +1,11 @@
+id: 12407774452
+type: node
+latitude: 38.67298
+longitude: -77.25838
+postcode: "22192"
+city: Woodbridge
+street: Old Bridge Road
+housenumber: "1391"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/woodbridge/joy-nail-spa.yml b/data/cities/woodbridge/joy-nail-spa.yml
new file mode 100644
index 000000000..2af7ba8d9
--- /dev/null
+++ b/data/cities/woodbridge/joy-nail-spa.yml
@@ -0,0 +1,11 @@
+id: 12407774451
+type: node
+latitude: 38.67291
+longitude: -77.25848
+postcode: "22192"
+city: Woodbridge
+street: Old Bridge Road
+housenumber: "1399"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/woodbridge/locksmith-outlet.yml b/data/cities/woodbridge/locksmith-outlet.yml
new file mode 100644
index 000000000..8d4ec96ce
--- /dev/null
+++ b/data/cities/woodbridge/locksmith-outlet.yml
@@ -0,0 +1,11 @@
+id: 12407774454
+type: node
+latitude: 38.67308
+longitude: -77.25831
+postcode: "22192"
+city: Woodbridge
+street: Old Bridge Road
+housenumber: "1379"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/woodbridge/yegna-ethiopian-market.yml b/data/cities/woodbridge/yegna-ethiopian-market.yml
new file mode 100644
index 000000000..c56dabbfe
--- /dev/null
+++ b/data/cities/woodbridge/yegna-ethiopian-market.yml
@@ -0,0 +1,11 @@
+id: 12407774447
+type: node
+latitude: 38.67276
+longitude: -77.25869
+postcode: "22192"
+city: Woodbridge
+street: Old Bridge Road
+housenumber: "1415"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/york-county/walgreens-geo-wash-mem-highway.yml b/data/cities/york-county/walgreens-geo-wash-mem-highway.yml
index 7d5296276..d6bffebdd 100644
--- a/data/cities/york-county/walgreens-geo-wash-mem-highway.yml
+++ b/data/cities/york-county/walgreens-geo-wash-mem-highway.yml
@@ -1,11 +1,11 @@
-id: 370116430
+id: 370063905
 type: node
-latitude: 37.11884
-longitude: -76.4558
-postcode: "23693"
+latitude: 37.1742
+longitude: -76.47481
+postcode: "23692"
 city: York County
 street: Geo Wash Mem Highway
-housenumber: "2400"
+housenumber: "6608"
 phone: ""
 opening_hours: ""
-website: https://www.walgreens.com/locator/walgreens-2400+george+washington+mem+hwy-yorktown-va-23693/id=10453
+website: https://www.walgreens.com/locator/walgreens-6608+george+washington+mem+hwy-yorktown-va-23692/id=9811
diff --git a/data/cities/york-county/walgreens.yml b/data/cities/york-county/walgreens.yml
index d6bffebdd..7d5296276 100644
--- a/data/cities/york-county/walgreens.yml
+++ b/data/cities/york-county/walgreens.yml
@@ -1,11 +1,11 @@
-id: 370063905
+id: 370116430
 type: node
-latitude: 37.1742
-longitude: -76.47481
-postcode: "23692"
+latitude: 37.11884
+longitude: -76.4558
+postcode: "23693"
 city: York County
 street: Geo Wash Mem Highway
-housenumber: "6608"
+housenumber: "2400"
 phone: ""
 opening_hours: ""
-website: https://www.walgreens.com/locator/walgreens-6608+george+washington+mem+hwy-yorktown-va-23692/id=9811
+website: https://www.walgreens.com/locator/walgreens-2400+george+washington+mem+hwy-yorktown-va-23693/id=10453
diff --git a/data/cities/yorktown/7-eleven-george-washington-memorial-highway.yml b/data/cities/yorktown/7-eleven-george-washington-memorial-highway.yml
deleted file mode 100644
index 19dc8745f..000000000
--- a/data/cities/yorktown/7-eleven-george-washington-memorial-highway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9652309745
-type: node
-latitude: 37.1968
-longitude: -76.49291
-postcode: "23692"
-city: Yorktown
-street: George Washington Memorial Highway
-housenumber: "8647"
-phone: ""
-opening_hours: 24/7
-website: ""
diff --git a/data/cities/yorktown/7-eleven.yml b/data/cities/yorktown/7-eleven.yml
index fab3ea1ac..19dc8745f 100644
--- a/data/cities/yorktown/7-eleven.yml
+++ b/data/cities/yorktown/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 9652284113
+id: 9652309745
 type: node
-latitude: 37.15524
-longitude: -76.46277
+latitude: 37.1968
+longitude: -76.49291
 postcode: "23692"
 city: Yorktown
 street: George Washington Memorial Highway
-housenumber: "5101"
-phone: +1-757-898-0207
+housenumber: "8647"
+phone: ""
 opening_hours: 24/7
 website: ""