diff --git a/content/cities/barefoot-bay/_index.md b/content/cities/barefoot-bay/_index.md
index d8c63b638..b3bc6b235 100644
--- a/content/cities/barefoot-bay/_index.md
+++ b/content/cities/barefoot-bay/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Barefoot Bay
 url: /barefoot-bay/
-latitude: 27.89
-longitude: -80.528
+latitude: 27.886
+longitude: -80.524
 ---
\ No newline at end of file
diff --git a/content/cities/brandon/walmart-supercenter-causeway-boulevard.md b/content/cities/brandon/walmart-supercenter-causeway-boulevard.md
new file mode 100644
index 000000000..d87e4a883
--- /dev/null
+++ b/content/cities/brandon/walmart-supercenter-causeway-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Walmart Supercenter"
+url: /brandon/walmart-supercenter-causeway-boulevard/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/brandon/walmart-supercenter-east-brandon-boulevard.md b/content/cities/brandon/walmart-supercenter-east-brandon-boulevard.md
deleted file mode 100644
index 145844118..000000000
--- a/content/cities/brandon/walmart-supercenter-east-brandon-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Walmart Supercenter"
-url: /brandon/walmart-supercenter-east-brandon-boulevard/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/brooksville/rivers-outdoor-archery.md b/content/cities/brooksville/rivers-outdoor-archery.md
new file mode 100644
index 000000000..3c42e4a4f
--- /dev/null
+++ b/content/cities/brooksville/rivers-outdoor-archery.md
@@ -0,0 +1,5 @@
+---
+title: "Rivers Outdoor Archery"
+url: /brooksville/rivers-outdoor-archery/
+shop: sports
+---
\ No newline at end of file
diff --git a/content/cities/cape-coral/speedway-del-prado-boulevard-south.md b/content/cities/cape-coral/speedway-del-prado-boulevard-south.md
new file mode 100644
index 000000000..a4a78a355
--- /dev/null
+++ b/content/cities/cape-coral/speedway-del-prado-boulevard-south.md
@@ -0,0 +1,5 @@
+---
+title: "Speedway"
+url: /cape-coral/speedway-del-prado-boulevard-south/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/cape-coral/speedway-santa-barbara-boulevard.md b/content/cities/cape-coral/speedway-santa-barbara-boulevard.md
deleted file mode 100644
index d344cbe6f..000000000
--- a/content/cities/cape-coral/speedway-santa-barbara-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Speedway"
-url: /cape-coral/speedway-santa-barbara-boulevard/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/clearwater-beach/_index.md b/content/cities/clearwater-beach/_index.md
index c4996180a..cc5c3486a 100644
--- a/content/cities/clearwater-beach/_index.md
+++ b/content/cities/clearwater-beach/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Clearwater Beach
 url: /clearwater-beach/
-latitude: 27.985
+latitude: 27.968
 longitude: -82.827
 ---
\ No newline at end of file
diff --git a/content/cities/clearwater-beach/speedway-bayway-boulevard.md b/content/cities/clearwater-beach/speedway-bayway-boulevard.md
deleted file mode 100644
index 6a0862696..000000000
--- a/content/cities/clearwater-beach/speedway-bayway-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Speedway"
-url: /clearwater-beach/speedway-bayway-boulevard/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/clearwater-beach/speedway-mandalay-avenue.md b/content/cities/clearwater-beach/speedway-mandalay-avenue.md
new file mode 100644
index 000000000..29b9e487d
--- /dev/null
+++ b/content/cities/clearwater-beach/speedway-mandalay-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "Speedway"
+url: /clearwater-beach/speedway-mandalay-avenue/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/naples/speedway-golden-gate-parkway.md b/content/cities/clearwater/speedway-harn-boulevard.md
similarity index 50%
rename from content/cities/naples/speedway-golden-gate-parkway.md
rename to content/cities/clearwater/speedway-harn-boulevard.md
index b9d271729..a79e5f28b 100644
--- a/content/cities/naples/speedway-golden-gate-parkway.md
+++ b/content/cities/clearwater/speedway-harn-boulevard.md
@@ -1,5 +1,5 @@
 ---
 title: "Speedway"
-url: /naples/speedway-golden-gate-parkway/
+url: /clearwater/speedway-harn-boulevard/
 shop: convenience
 ---
\ No newline at end of file
diff --git a/content/cities/clearwater/speedway-roosevelt-boulevard-2.md b/content/cities/clearwater/speedway-roosevelt-boulevard-2.md
deleted file mode 100644
index d1e3a4d69..000000000
--- a/content/cities/clearwater/speedway-roosevelt-boulevard-2.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Speedway"
-url: /clearwater/speedway-roosevelt-boulevard-2/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/clearwater/walgreens-belcher-road.md b/content/cities/clearwater/walgreens-belcher-road.md
deleted file mode 100644
index 1a5de8db0..000000000
--- a/content/cities/clearwater/walgreens-belcher-road.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Walgreens"
-url: /clearwater/walgreens-belcher-road/
-shop: chemist
----
\ No newline at end of file
diff --git a/content/cities/clearwater/walgreens-roosevelt-boulevard.md b/content/cities/clearwater/walgreens-roosevelt-boulevard.md
new file mode 100644
index 000000000..1a7a551cf
--- /dev/null
+++ b/content/cities/clearwater/walgreens-roosevelt-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Walgreens"
+url: /clearwater/walgreens-roosevelt-boulevard/
+shop: chemist
+---
\ No newline at end of file
diff --git a/content/cities/clermont/publix-county-road-455.md b/content/cities/clermont/publix-us-highway-27.md
similarity index 51%
rename from content/cities/clermont/publix-county-road-455.md
rename to content/cities/clermont/publix-us-highway-27.md
index 1d460a647..178b06554 100644
--- a/content/cities/clermont/publix-county-road-455.md
+++ b/content/cities/clermont/publix-us-highway-27.md
@@ -1,5 +1,5 @@
 ---
 title: "Publix"
-url: /clermont/publix-county-road-455/
+url: /clermont/publix-us-highway-27/
 shop: supermarket
 ---
\ No newline at end of file
diff --git a/content/cities/daytona-beach-shores/_index.md b/content/cities/daytona-beach-shores/_index.md
index a1a15d143..186968e2f 100644
--- a/content/cities/daytona-beach-shores/_index.md
+++ b/content/cities/daytona-beach-shores/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Daytona Beach Shores
 url: /daytona-beach-shores/
-latitude: 29.196
-longitude: -80.994
+latitude: 29.153
+longitude: -80.97
 ---
\ No newline at end of file
diff --git a/content/cities/daytona-beach/saveway-gift-shop-and-food-store.md b/content/cities/daytona-beach/saveway-gift-shop-and-food-store.md
deleted file mode 100644
index 3c78bd0d3..000000000
--- a/content/cities/daytona-beach/saveway-gift-shop-and-food-store.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Saveway Gift Shop & Food Store"
-url: /daytona-beach/saveway-gift-shop-and-food-store/
-shop: shop
----
\ No newline at end of file
diff --git a/content/cities/deland/walgreens-east-new-york-avenue.md b/content/cities/deland/walgreens-east-new-york-avenue.md
new file mode 100644
index 000000000..a29a945fd
--- /dev/null
+++ b/content/cities/deland/walgreens-east-new-york-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "Walgreens"
+url: /deland/walgreens-east-new-york-avenue/
+shop: chemist
+---
\ No newline at end of file
diff --git a/content/cities/deland/walgreens-north-woodland-boulevard.md b/content/cities/deland/walgreens-north-woodland-boulevard.md
deleted file mode 100644
index b9bb485f9..000000000
--- a/content/cities/deland/walgreens-north-woodland-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Walgreens"
-url: /deland/walgreens-north-woodland-boulevard/
-shop: chemist
----
\ No newline at end of file
diff --git a/content/cities/fort-lauderdale/speedway-north-dixie-highway.md b/content/cities/fort-lauderdale/speedway-north-dixie-highway.md
deleted file mode 100644
index 42505baa1..000000000
--- a/content/cities/fort-lauderdale/speedway-north-dixie-highway.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Speedway"
-url: /fort-lauderdale/speedway-north-dixie-highway/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/fort-lauderdale/speedway-north-ocean-boulevard.md b/content/cities/fort-lauderdale/speedway-north-ocean-boulevard.md
new file mode 100644
index 000000000..3f5d0f4d2
--- /dev/null
+++ b/content/cities/fort-lauderdale/speedway-north-ocean-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Speedway"
+url: /fort-lauderdale/speedway-north-ocean-boulevard/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/fort-walton-beach/publix-eglin-parkway-north.md b/content/cities/fort-walton-beach/publix-eglin-parkway-north.md
deleted file mode 100644
index fdef71bec..000000000
--- a/content/cities/fort-walton-beach/publix-eglin-parkway-north.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Publix"
-url: /fort-walton-beach/publix-eglin-parkway-north/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/fort-walton-beach/publix-miracle-strip-parkway-southeast.md b/content/cities/fort-walton-beach/publix-miracle-strip-parkway-southeast.md
new file mode 100644
index 000000000..2300e2121
--- /dev/null
+++ b/content/cities/fort-walton-beach/publix-miracle-strip-parkway-southeast.md
@@ -0,0 +1,5 @@
+---
+title: "Publix"
+url: /fort-walton-beach/publix-miracle-strip-parkway-southeast/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/pensacola/dollar-tree-mobile-highway.md b/content/cities/hollywood/dollar-tree-south-state-road-7.md
similarity index 50%
rename from content/cities/pensacola/dollar-tree-mobile-highway.md
rename to content/cities/hollywood/dollar-tree-south-state-road-7.md
index 86c6fc5e0..cc73031d2 100644
--- a/content/cities/pensacola/dollar-tree-mobile-highway.md
+++ b/content/cities/hollywood/dollar-tree-south-state-road-7.md
@@ -1,5 +1,5 @@
 ---
 title: "Dollar Tree"
-url: /pensacola/dollar-tree-mobile-highway/
+url: /hollywood/dollar-tree-south-state-road-7/
 shop: variety store
 ---
\ No newline at end of file
diff --git a/content/cities/jacksonville-beach/_index.md b/content/cities/jacksonville-beach/_index.md
index 69583cd93..44c59399c 100644
--- a/content/cities/jacksonville-beach/_index.md
+++ b/content/cities/jacksonville-beach/_index.md
@@ -2,5 +2,5 @@
 title: Jacksonville Beach
 url: /jacksonville-beach/
 latitude: 30.257
-longitude: -81.391
+longitude: -81.394
 ---
\ No newline at end of file
diff --git a/content/cities/jacksonville/_index.md b/content/cities/jacksonville/_index.md
index 8915c2a48..c4747903b 100644
--- a/content/cities/jacksonville/_index.md
+++ b/content/cities/jacksonville/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Jacksonville
 url: /jacksonville/
-latitude: 30.316
-longitude: -81.734
+latitude: 30.219
+longitude: -81.553
 ---
\ No newline at end of file
diff --git a/content/cities/kissimmee/ross-north-john-young-parkway.md b/content/cities/kissimmee/ross-north-john-young-parkway.md
deleted file mode 100644
index 55017625b..000000000
--- a/content/cities/kissimmee/ross-north-john-young-parkway.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Ross"
-url: /kissimmee/ross-north-john-young-parkway/
-shop: department store
----
\ No newline at end of file
diff --git a/content/cities/kissimmee/ross-rolling-oaks-boulevard.md b/content/cities/kissimmee/ross-rolling-oaks-boulevard.md
new file mode 100644
index 000000000..ed5443be1
--- /dev/null
+++ b/content/cities/kissimmee/ross-rolling-oaks-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Ross"
+url: /kissimmee/ross-rolling-oaks-boulevard/
+shop: department store
+---
\ No newline at end of file
diff --git a/content/cities/panama-city/dollar-general-east-5th-street.md b/content/cities/masaryktown/dollar-general.md
similarity index 50%
rename from content/cities/panama-city/dollar-general-east-5th-street.md
rename to content/cities/masaryktown/dollar-general.md
index 8df54c7e4..edee060d0 100644
--- a/content/cities/panama-city/dollar-general-east-5th-street.md
+++ b/content/cities/masaryktown/dollar-general.md
@@ -1,5 +1,5 @@
 ---
 title: "Dollar General"
-url: /panama-city/dollar-general-east-5th-street/
+url: /masaryktown/dollar-general/
 shop: variety store
 ---
\ No newline at end of file
diff --git a/content/cities/mayo/_index.md b/content/cities/mayo/_index.md
index 8417a4630..81d8ba771 100644
--- a/content/cities/mayo/_index.md
+++ b/content/cities/mayo/_index.md
@@ -2,5 +2,5 @@
 title: Mayo
 url: /mayo/
 latitude: 30.053
-longitude: -83.174
+longitude: -83.176
 ---
\ No newline at end of file
diff --git a/content/cities/miami/fluent-north-kendall-drive.md b/content/cities/miami/fluent-north-kendall-drive.md
deleted file mode 100644
index 241a4190a..000000000
--- a/content/cities/miami/fluent-north-kendall-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Fluent"
-url: /miami/fluent-north-kendall-drive/
-shop: cannabis
----
\ No newline at end of file
diff --git a/content/cities/miami/fluent-southwest-211th-street.md b/content/cities/miami/fluent-southwest-211th-street.md
new file mode 100644
index 000000000..756706edf
--- /dev/null
+++ b/content/cities/miami/fluent-southwest-211th-street.md
@@ -0,0 +1,5 @@
+---
+title: "Fluent"
+url: /miami/fluent-southwest-211th-street/
+shop: cannabis
+---
\ No newline at end of file
diff --git a/content/cities/miami/the-home-depot-southwest-32nd-avenue.md b/content/cities/miami/the-home-depot-west-flagler-street.md
similarity index 50%
rename from content/cities/miami/the-home-depot-southwest-32nd-avenue.md
rename to content/cities/miami/the-home-depot-west-flagler-street.md
index a1c2efab3..45ef09bb7 100644
--- a/content/cities/miami/the-home-depot-southwest-32nd-avenue.md
+++ b/content/cities/miami/the-home-depot-west-flagler-street.md
@@ -1,5 +1,5 @@
 ---
 title: "The Home Depot"
-url: /miami/the-home-depot-southwest-32nd-avenue/
+url: /miami/the-home-depot-west-flagler-street/
 shop: doityourself
 ---
\ No newline at end of file
diff --git a/content/cities/naples/speedway-goodlette-road-north.md b/content/cities/naples/speedway-goodlette-road-north.md
new file mode 100644
index 000000000..6c3adcfd2
--- /dev/null
+++ b/content/cities/naples/speedway-goodlette-road-north.md
@@ -0,0 +1,5 @@
+---
+title: "Speedway"
+url: /naples/speedway-goodlette-road-north/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/naples/the-home-depot-airport-pulling-road-south.md b/content/cities/naples/the-home-depot-airport-pulling-road-south.md
new file mode 100644
index 000000000..7d08ebddb
--- /dev/null
+++ b/content/cities/naples/the-home-depot-airport-pulling-road-south.md
@@ -0,0 +1,5 @@
+---
+title: "The Home Depot"
+url: /naples/the-home-depot-airport-pulling-road-south/
+shop: doityourself
+---
\ No newline at end of file
diff --git a/content/cities/niceville/_index.md b/content/cities/niceville/_index.md
index f96fe7636..9e53f5630 100644
--- a/content/cities/niceville/_index.md
+++ b/content/cities/niceville/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Niceville
 url: /niceville/
-latitude: 30.516
-longitude: -86.473
+latitude: 30.518
+longitude: -86.468
 ---
\ No newline at end of file
diff --git a/content/cities/orlando/the-master-barber-experience.md b/content/cities/orlando/the-master-barber-experience.md
new file mode 100644
index 000000000..ffe404874
--- /dev/null
+++ b/content/cities/orlando/the-master-barber-experience.md
@@ -0,0 +1,5 @@
+---
+title: "The Master Barber Experience"
+url: /orlando/the-master-barber-experience/
+shop: hairdresser
+---
\ No newline at end of file
diff --git a/content/cities/panama-city/dollar-general-west-18th-street.md b/content/cities/panama-city/dollar-general-west-18th-street.md
new file mode 100644
index 000000000..e44292932
--- /dev/null
+++ b/content/cities/panama-city/dollar-general-west-18th-street.md
@@ -0,0 +1,5 @@
+---
+title: "Dollar General"
+url: /panama-city/dollar-general-west-18th-street/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/pensacola/boost-mobile-north-pace-boulevard.md b/content/cities/pensacola/boost-mobile-north-pace-boulevard.md
new file mode 100644
index 000000000..de6291586
--- /dev/null
+++ b/content/cities/pensacola/boost-mobile-north-pace-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Boost Mobile"
+url: /pensacola/boost-mobile-north-pace-boulevard/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/pensacola/boost-mobile-west-fairfield-drive.md b/content/cities/pensacola/boost-mobile-west-fairfield-drive.md
deleted file mode 100644
index cf886d0f0..000000000
--- a/content/cities/pensacola/boost-mobile-west-fairfield-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Boost Mobile"
-url: /pensacola/boost-mobile-west-fairfield-drive/
-shop: mobile phone
----
\ No newline at end of file
diff --git a/content/cities/pensacola/dollar-tree-north-davis-highway.md b/content/cities/pensacola/dollar-tree-north-davis-highway.md
new file mode 100644
index 000000000..008883a7c
--- /dev/null
+++ b/content/cities/pensacola/dollar-tree-north-davis-highway.md
@@ -0,0 +1,5 @@
+---
+title: "Dollar Tree"
+url: /pensacola/dollar-tree-north-davis-highway/
+shop: variety store
+---
\ No newline at end of file
diff --git a/content/cities/port-saint-lucie/racetrac-south-us-highway-1.md b/content/cities/port-saint-lucie/racetrac-south-us-highway-1.md
new file mode 100644
index 000000000..745e31045
--- /dev/null
+++ b/content/cities/port-saint-lucie/racetrac-south-us-highway-1.md
@@ -0,0 +1,5 @@
+---
+title: "RaceTrac"
+url: /port-saint-lucie/racetrac-south-us-highway-1/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/port-saint-lucie/racetrac-southwest-port-saint-lucie-boulevard.md b/content/cities/port-saint-lucie/racetrac-southwest-port-saint-lucie-boulevard.md
deleted file mode 100644
index e1ef3e0d0..000000000
--- a/content/cities/port-saint-lucie/racetrac-southwest-port-saint-lucie-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "RaceTrac"
-url: /port-saint-lucie/racetrac-southwest-port-saint-lucie-boulevard/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/port-st-joe/_index.md b/content/cities/port-st-joe/_index.md
index 6840188c0..c98aa9019 100644
--- a/content/cities/port-st-joe/_index.md
+++ b/content/cities/port-st-joe/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Port St. Joe
 url: /port-st-joe/
-latitude: 29.816
-longitude: -85.302
+latitude: 29.817
+longitude: -85.307
 ---
\ No newline at end of file
diff --git a/content/cities/reddick/_index.md b/content/cities/reddick/_index.md
index ca58e9875..c1923ba6b 100644
--- a/content/cities/reddick/_index.md
+++ b/content/cities/reddick/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Reddick
 url: /reddick/
-latitude: 29.367
-longitude: -82.197
+latitude: 29.375
+longitude: -82.2
 ---
\ No newline at end of file
diff --git a/content/cities/sarasota/gauthier-salon-and-wellness-spa.md b/content/cities/sarasota/gauthier-salon-and-wellness-spa.md
new file mode 100644
index 000000000..84300119d
--- /dev/null
+++ b/content/cities/sarasota/gauthier-salon-and-wellness-spa.md
@@ -0,0 +1,5 @@
+---
+title: "Gauthier Salon & Wellness Spa"
+url: /sarasota/gauthier-salon-and-wellness-spa/
+shop: beauty
+---
\ No newline at end of file
diff --git a/content/cities/springfield/_index.md b/content/cities/springfield/_index.md
index c21adefb7..85c4652c2 100644
--- a/content/cities/springfield/_index.md
+++ b/content/cities/springfield/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Springfield
 url: /springfield/
-latitude: 30.154
-longitude: -85.617
+latitude: 30.176
+longitude: -85.608
 ---
\ No newline at end of file
diff --git a/content/cities/sunrise/walmart-supercenter-north-university-drive.md b/content/cities/sunrise/walmart-supercenter-north-university-drive.md
deleted file mode 100644
index 51dce62bd..000000000
--- a/content/cities/sunrise/walmart-supercenter-north-university-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Walmart Supercenter"
-url: /sunrise/walmart-supercenter-north-university-drive/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/sunrise/walmart-supercenter-west-sunrise-boulevard.md b/content/cities/sunrise/walmart-supercenter-west-sunrise-boulevard.md
new file mode 100644
index 000000000..74ac9780b
--- /dev/null
+++ b/content/cities/sunrise/walmart-supercenter-west-sunrise-boulevard.md
@@ -0,0 +1,5 @@
+---
+title: "Walmart Supercenter"
+url: /sunrise/walmart-supercenter-west-sunrise-boulevard/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/tampa/_index.md b/content/cities/tampa/_index.md
index 04d685b8d..3ed164b29 100644
--- a/content/cities/tampa/_index.md
+++ b/content/cities/tampa/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Tampa
 url: /tampa/
-latitude: 28.132
-longitude: -82.366
+latitude: 27.947
+longitude: -82.447
 ---
\ No newline at end of file
diff --git a/content/cities/tampa/aarons-north-armenia-avenue.md b/content/cities/tampa/aarons-north-armenia-avenue.md
deleted file mode 100644
index 8e434f8dc..000000000
--- a/content/cities/tampa/aarons-north-armenia-avenue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Aaron's"
-url: /tampa/aarons-north-armenia-avenue/
-shop: furniture
----
\ No newline at end of file
diff --git a/content/cities/tampa/aarons-north-florida-avenue.md b/content/cities/tampa/aarons-north-florida-avenue.md
new file mode 100644
index 000000000..6a37c6dae
--- /dev/null
+++ b/content/cities/tampa/aarons-north-florida-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "Aaron's"
+url: /tampa/aarons-north-florida-avenue/
+shop: furniture
+---
\ No newline at end of file
diff --git a/content/cities/tampa/mikes-auto-glass-express.md b/content/cities/tampa/mikes-auto-glass-express.md
new file mode 100644
index 000000000..0253a9568
--- /dev/null
+++ b/content/cities/tampa/mikes-auto-glass-express.md
@@ -0,0 +1,5 @@
+---
+title: "Mike's Auto Glass Express"
+url: /tampa/mikes-auto-glass-express/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/tampa/mikes-auto-glass-tampa.md b/content/cities/tampa/mikes-auto-glass-tampa.md
new file mode 100644
index 000000000..8864fb319
--- /dev/null
+++ b/content/cities/tampa/mikes-auto-glass-tampa.md
@@ -0,0 +1,5 @@
+---
+title: "Mike's Auto Glass Tampa"
+url: /tampa/mikes-auto-glass-tampa/
+shop: car repair
+---
\ No newline at end of file
diff --git a/content/cities/naples/the-home-depot-pine-ridge-road.md b/content/cities/tampa/the-home-depot-adamo-drive.md
similarity index 52%
rename from content/cities/naples/the-home-depot-pine-ridge-road.md
rename to content/cities/tampa/the-home-depot-adamo-drive.md
index ace143f7d..033e83180 100644
--- a/content/cities/naples/the-home-depot-pine-ridge-road.md
+++ b/content/cities/tampa/the-home-depot-adamo-drive.md
@@ -1,5 +1,5 @@
 ---
 title: "The Home Depot"
-url: /naples/the-home-depot-pine-ridge-road/
+url: /tampa/the-home-depot-adamo-drive/
 shop: doityourself
 ---
\ No newline at end of file
diff --git a/content/cities/tampa/the-home-depot-bruce-b-downs-boulevard.md b/content/cities/tampa/the-home-depot-bruce-b-downs-boulevard.md
deleted file mode 100644
index 0b63333e2..000000000
--- a/content/cities/tampa/the-home-depot-bruce-b-downs-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "The Home Depot"
-url: /tampa/the-home-depot-bruce-b-downs-boulevard/
-shop: doityourself
----
\ No newline at end of file
diff --git a/content/cities/valrico/goodyear-fl-60.md b/content/cities/valrico/goodyear-bell-shoals-road.md
similarity index 50%
rename from content/cities/valrico/goodyear-fl-60.md
rename to content/cities/valrico/goodyear-bell-shoals-road.md
index e342d5789..400c69e28 100644
--- a/content/cities/valrico/goodyear-fl-60.md
+++ b/content/cities/valrico/goodyear-bell-shoals-road.md
@@ -1,5 +1,5 @@
 ---
 title: "Goodyear"
-url: /valrico/goodyear-fl-60/
+url: /valrico/goodyear-bell-shoals-road/
 shop: car repair
 ---
\ No newline at end of file
diff --git a/data/cities/aventura/verizon-biscayne-boulevard.yml b/data/cities/aventura/verizon-biscayne-boulevard.yml
index c51006b02..665b5b705 100644
--- a/data/cities/aventura/verizon-biscayne-boulevard.yml
+++ b/data/cities/aventura/verizon-biscayne-boulevard.yml
@@ -1,11 +1,11 @@
-id: 6032396832
+id: 6032184851
 type: node
-latitude: 25.96519
-longitude: -80.14365
+latitude: 25.94955
+longitude: -80.14567
 postcode: "33180"
 city: Aventura
 street: Biscayne Boulevard
-housenumber: "20533"
+housenumber: "18707"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/aventura/verizon.yml b/data/cities/aventura/verizon.yml
index 665b5b705..c51006b02 100644
--- a/data/cities/aventura/verizon.yml
+++ b/data/cities/aventura/verizon.yml
@@ -1,11 +1,11 @@
-id: 6032184851
+id: 6032396832
 type: node
-latitude: 25.94955
-longitude: -80.14567
+latitude: 25.96519
+longitude: -80.14365
 postcode: "33180"
 city: Aventura
 street: Biscayne Boulevard
-housenumber: "18707"
+housenumber: "20533"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/brandon/walmart-supercenter-causeway-boulevard.yml b/data/cities/brandon/walmart-supercenter-causeway-boulevard.yml
new file mode 100644
index 000000000..fa394aa89
--- /dev/null
+++ b/data/cities/brandon/walmart-supercenter-causeway-boulevard.yml
@@ -0,0 +1,11 @@
+id: 289796082
+type: node
+latitude: 27.92493
+longitude: -82.3258
+postcode: "33511"
+city: Brandon
+street: Causeway Boulevard
+housenumber: "11110"
+phone: +1 813-661-4426
+opening_hours: Mo-Su 06:00-24:00
+website: https://www.walmart.com/store/2387-brandon-fl
diff --git a/data/cities/brandon/walmart-supercenter-east-brandon-boulevard.yml b/data/cities/brandon/walmart-supercenter-east-brandon-boulevard.yml
deleted file mode 100644
index accef1bd6..000000000
--- a/data/cities/brandon/walmart-supercenter-east-brandon-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 322997397
-type: node
-latitude: 27.94109
-longitude: -82.26588
-postcode: "33511"
-city: Brandon
-street: East Brandon Boulevard
-housenumber: "1208"
-phone: +1 813-651-9040
-opening_hours: 24/7
-website: https://www.walmart.com/store/3463-brandon-fl
diff --git a/data/cities/brandon/walmart-supercenter.yml b/data/cities/brandon/walmart-supercenter.yml
index fa394aa89..accef1bd6 100644
--- a/data/cities/brandon/walmart-supercenter.yml
+++ b/data/cities/brandon/walmart-supercenter.yml
@@ -1,11 +1,11 @@
-id: 289796082
+id: 322997397
 type: node
-latitude: 27.92493
-longitude: -82.3258
+latitude: 27.94109
+longitude: -82.26588
 postcode: "33511"
 city: Brandon
-street: Causeway Boulevard
-housenumber: "11110"
-phone: +1 813-661-4426
-opening_hours: Mo-Su 06:00-24:00
-website: https://www.walmart.com/store/2387-brandon-fl
+street: East Brandon Boulevard
+housenumber: "1208"
+phone: +1 813-651-9040
+opening_hours: 24/7
+website: https://www.walmart.com/store/3463-brandon-fl
diff --git a/data/cities/brooksville/rivers-outdoor-archery.yml b/data/cities/brooksville/rivers-outdoor-archery.yml
new file mode 100644
index 000000000..bb6fb18e4
--- /dev/null
+++ b/data/cities/brooksville/rivers-outdoor-archery.yml
@@ -0,0 +1,11 @@
+id: 12300532677
+type: node
+latitude: 28.45125
+longitude: -82.45053
+postcode: "34604"
+city: Brooksville
+street: Ayers Road
+housenumber: "17044"
+phone: +1 352 797 2688
+opening_hours: Tu-Fr 10:00-19:00; Sa 9:00-17:00
+website: https://riversoutdoorsandarchery.com/
diff --git a/data/cities/cape-coral/speedway-del-prado-boulevard-south.yml b/data/cities/cape-coral/speedway-del-prado-boulevard-south.yml
new file mode 100644
index 000000000..1fd713f3d
--- /dev/null
+++ b/data/cities/cape-coral/speedway-del-prado-boulevard-south.yml
@@ -0,0 +1,11 @@
+id: 8873357172
+type: node
+latitude: 26.63351
+longitude: -81.94123
+postcode: "33990"
+city: Cape Coral
+street: Del Prado Boulevard South
+housenumber: "1006"
+phone: ""
+opening_hours: ""
+website: https://www.speedway.com/locations/FL/Cape-Coral/1006-DEL-PRADO-BLVD-S
diff --git a/data/cities/cape-coral/speedway-santa-barbara-boulevard.yml b/data/cities/cape-coral/speedway-santa-barbara-boulevard.yml
deleted file mode 100644
index 59595428a..000000000
--- a/data/cities/cape-coral/speedway-santa-barbara-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8870616904
-type: node
-latitude: 26.63208
-longitude: -81.97502
-postcode: "33991"
-city: Cape Coral
-street: Santa Barbara Boulevard
-housenumber: "1020"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/cape-coral/speedway.yml b/data/cities/cape-coral/speedway.yml
index 1fd713f3d..59595428a 100644
--- a/data/cities/cape-coral/speedway.yml
+++ b/data/cities/cape-coral/speedway.yml
@@ -1,11 +1,11 @@
-id: 8873357172
+id: 8870616904
 type: node
-latitude: 26.63351
-longitude: -81.94123
-postcode: "33990"
+latitude: 26.63208
+longitude: -81.97502
+postcode: "33991"
 city: Cape Coral
-street: Del Prado Boulevard South
-housenumber: "1006"
+street: Santa Barbara Boulevard
+housenumber: "1020"
 phone: ""
 opening_hours: ""
-website: https://www.speedway.com/locations/FL/Cape-Coral/1006-DEL-PRADO-BLVD-S
+website: ""
diff --git a/data/cities/clearwater-beach/speedway-bayway-boulevard.yml b/data/cities/clearwater-beach/speedway-mandalay-avenue.yml
similarity index 55%
rename from data/cities/clearwater-beach/speedway-bayway-boulevard.yml
rename to data/cities/clearwater-beach/speedway-mandalay-avenue.yml
index 442c74984..3f4c0b2d4 100644
--- a/data/cities/clearwater-beach/speedway-bayway-boulevard.yml
+++ b/data/cities/clearwater-beach/speedway-mandalay-avenue.yml
@@ -1,11 +1,11 @@
-id: 8896155309
+id: 8896213924
 type: node
-latitude: 27.96762
-longitude: -82.82654
+latitude: 27.98531
+longitude: -82.82694
 postcode: "33767"
 city: Clearwater Beach
-street: Bayway Boulevard
-housenumber: "601"
+street: Mandalay Avenue
+housenumber: "580"
 phone: ""
 opening_hours: ""
-website: https://www.speedway.com/locations/FL/Clearwater-Beach/601-BAYWAY-BLVD
+website: https://www.speedway.com/locations/FL/Clearwater-Beach/32-BAY-ESPLANADE
diff --git a/data/cities/clearwater-beach/speedway.yml b/data/cities/clearwater-beach/speedway.yml
index 3f4c0b2d4..442c74984 100644
--- a/data/cities/clearwater-beach/speedway.yml
+++ b/data/cities/clearwater-beach/speedway.yml
@@ -1,11 +1,11 @@
-id: 8896213924
+id: 8896155309
 type: node
-latitude: 27.98531
-longitude: -82.82694
+latitude: 27.96762
+longitude: -82.82654
 postcode: "33767"
 city: Clearwater Beach
-street: Mandalay Avenue
-housenumber: "580"
+street: Bayway Boulevard
+housenumber: "601"
 phone: ""
 opening_hours: ""
-website: https://www.speedway.com/locations/FL/Clearwater-Beach/32-BAY-ESPLANADE
+website: https://www.speedway.com/locations/FL/Clearwater-Beach/601-BAYWAY-BLVD
diff --git a/data/cities/clearwater/shoot-straight-clearwater.yml b/data/cities/clearwater/shoot-straight-clearwater.yml
index 680ce5384..2484ced4b 100644
--- a/data/cities/clearwater/shoot-straight-clearwater.yml
+++ b/data/cities/clearwater/shoot-straight-clearwater.yml
@@ -7,11 +7,6 @@ city: Clearwater
 street: Ulmerton Road
 housenumber: "4594"
 phone: "+17275464447"
-opening_hours: |-
-    Store Hours:
-    Mon – Sat:	10:00AM – 7:00PM
-    Sun:	11:00AM – 7:00PM
-    Range Hours:
-    Mon – Sat: 10:00AM – 6:30PM
-    Sun:	11:00AM – 6:30PM
+opening_hours: 'Store Hours: Mon - Sat: 10:00AM - 7:00PM Sun: 11:00AM - 7:00PM Range
+    Hours: Mon - Sat: 10:00AM - 6:30PM Sun: 11:00AM - 6:30PM'
 website: http://shoot-straight.com/
diff --git a/data/cities/clearwater/speedway-harn-boulevard.yml b/data/cities/clearwater/speedway-harn-boulevard.yml
new file mode 100644
index 000000000..940dd39c8
--- /dev/null
+++ b/data/cities/clearwater/speedway-harn-boulevard.yml
@@ -0,0 +1,11 @@
+id: 8896189206
+type: node
+latitude: 27.94619
+longitude: -82.7311
+postcode: "33764"
+city: Clearwater
+street: Harn Boulevard
+housenumber: "2577"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/clearwater/speedway-roosevelt-boulevard-2.yml b/data/cities/clearwater/speedway-roosevelt-boulevard-2.yml
deleted file mode 100644
index ca4597a9c..000000000
--- a/data/cities/clearwater/speedway-roosevelt-boulevard-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8896245906
-type: node
-latitude: 27.91564
-longitude: -82.71324
-postcode: "33760"
-city: Clearwater
-street: Roosevelt Boulevard
-housenumber: "5798"
-phone: +1 727 531 6788
-opening_hours: ""
-website: ""
diff --git a/data/cities/clearwater/speedway-roosevelt-boulevard.yml b/data/cities/clearwater/speedway-roosevelt-boulevard.yml
index a8990ee77..ca4597a9c 100644
--- a/data/cities/clearwater/speedway-roosevelt-boulevard.yml
+++ b/data/cities/clearwater/speedway-roosevelt-boulevard.yml
@@ -1,11 +1,11 @@
-id: 8896245897
+id: 8896245906
 type: node
-latitude: 27.91681
-longitude: -82.72569
+latitude: 27.91564
+longitude: -82.71324
 postcode: "33760"
 city: Clearwater
 street: Roosevelt Boulevard
-housenumber: "2698"
-phone: ""
+housenumber: "5798"
+phone: +1 727 531 6788
 opening_hours: ""
 website: ""
diff --git a/data/cities/clearwater/speedway.yml b/data/cities/clearwater/speedway.yml
index 940dd39c8..a8990ee77 100644
--- a/data/cities/clearwater/speedway.yml
+++ b/data/cities/clearwater/speedway.yml
@@ -1,11 +1,11 @@
-id: 8896189206
+id: 8896245897
 type: node
-latitude: 27.94619
-longitude: -82.7311
-postcode: "33764"
+latitude: 27.91681
+longitude: -82.72569
+postcode: "33760"
 city: Clearwater
-street: Harn Boulevard
-housenumber: "2577"
+street: Roosevelt Boulevard
+housenumber: "2698"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/clearwater/walgreens-belcher-road.yml b/data/cities/clearwater/walgreens-belcher-road.yml
deleted file mode 100644
index a45149d05..000000000
--- a/data/cities/clearwater/walgreens-belcher-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 192573634
-type: node
-latitude: 27.9895
-longitude: -82.74683
-postcode: "33765"
-city: Clearwater
-street: Belcher Road
-housenumber: "1880"
-phone: ""
-opening_hours: ""
-website: https://www.walgreens.com/locator/walgreens-1880+n+belcher+rd-clearwater-fl-33765/id=3555
diff --git a/data/cities/clearwater/walgreens-roosevelt-boulevard.yml b/data/cities/clearwater/walgreens-roosevelt-boulevard.yml
new file mode 100644
index 000000000..78b96d1dd
--- /dev/null
+++ b/data/cities/clearwater/walgreens-roosevelt-boulevard.yml
@@ -0,0 +1,11 @@
+id: 229319009
+type: node
+latitude: 27.91573
+longitude: -82.71391
+postcode: "33760"
+city: Clearwater
+street: Roosevelt Boulevard
+housenumber: "2991"
+phone: ""
+opening_hours: ""
+website: https://www.walgreens.com/locator/walgreens-2991+roosevelt+blvd-clearwater-fl-33760/id=6608
diff --git a/data/cities/clearwater/walgreens.yml b/data/cities/clearwater/walgreens.yml
index 78b96d1dd..a45149d05 100644
--- a/data/cities/clearwater/walgreens.yml
+++ b/data/cities/clearwater/walgreens.yml
@@ -1,11 +1,11 @@
-id: 229319009
+id: 192573634
 type: node
-latitude: 27.91573
-longitude: -82.71391
-postcode: "33760"
+latitude: 27.9895
+longitude: -82.74683
+postcode: "33765"
 city: Clearwater
-street: Roosevelt Boulevard
-housenumber: "2991"
+street: Belcher Road
+housenumber: "1880"
 phone: ""
 opening_hours: ""
-website: https://www.walgreens.com/locator/walgreens-2991+roosevelt+blvd-clearwater-fl-33760/id=6608
+website: https://www.walgreens.com/locator/walgreens-1880+n+belcher+rd-clearwater-fl-33765/id=3555
diff --git a/data/cities/clermont/publix-county-road-455.yml b/data/cities/clermont/publix-county-road-455.yml
deleted file mode 100644
index 8e5225d16..000000000
--- a/data/cities/clermont/publix-county-road-455.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3184295701
-type: node
-latitude: 28.54848
-longitude: -81.681
-postcode: 34711-9052
-city: Clermont
-street: County Road 455
-housenumber: "13900"
-phone: +1 407-877-1545
-opening_hours: Mo-Su 07:00-22:00
-website: https://www.publix.com/locations/27
diff --git a/data/cities/clermont/publix-us-highway-27.yml b/data/cities/clermont/publix-us-highway-27.yml
new file mode 100644
index 000000000..969877a4f
--- /dev/null
+++ b/data/cities/clermont/publix-us-highway-27.yml
@@ -0,0 +1,11 @@
+id: 3168115586
+type: node
+latitude: 28.38227
+longitude: -81.68678
+postcode: "34714"
+city: Clermont
+street: US Highway 27
+housenumber: "2430"
+phone: +1 352-243-5279
+opening_hours: Mo-Su 07:00-22:00
+website: https://www.publix.com/locations/1357
diff --git a/data/cities/clermont/publix.yml b/data/cities/clermont/publix.yml
index 969877a4f..8e5225d16 100644
--- a/data/cities/clermont/publix.yml
+++ b/data/cities/clermont/publix.yml
@@ -1,11 +1,11 @@
-id: 3168115586
+id: 3184295701
 type: node
-latitude: 28.38227
-longitude: -81.68678
-postcode: "34714"
+latitude: 28.54848
+longitude: -81.681
+postcode: 34711-9052
 city: Clermont
-street: US Highway 27
-housenumber: "2430"
-phone: +1 352-243-5279
+street: County Road 455
+housenumber: "13900"
+phone: +1 407-877-1545
 opening_hours: Mo-Su 07:00-22:00
-website: https://www.publix.com/locations/1357
+website: https://www.publix.com/locations/27
diff --git a/data/cities/daytona-beach/saveway-gift-shop-and-food-store.yml b/data/cities/daytona-beach/saveway-gift-shop-and-food-store.yml
deleted file mode 100644
index c8df5b57c..000000000
--- a/data/cities/daytona-beach/saveway-gift-shop-and-food-store.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8591553006
-type: node
-latitude: 29.16452
-longitude: -80.97649
-postcode: "32118"
-city: Daytona Beach
-street: South Atlantic Avenue
-housenumber: ""
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/deland/walgreens-east-new-york-avenue.yml b/data/cities/deland/walgreens-east-new-york-avenue.yml
new file mode 100644
index 000000000..8f11c06d6
--- /dev/null
+++ b/data/cities/deland/walgreens-east-new-york-avenue.yml
@@ -0,0 +1,11 @@
+id: 631392463
+type: node
+latitude: 29.02776
+longitude: -81.29893
+postcode: "32724"
+city: DeLand
+street: East New York Avenue
+housenumber: "300"
+phone: ""
+opening_hours: ""
+website: https://www.walgreens.com/locator/walgreens-300+e+new+york+ave-deland-fl-32724/id=13678
diff --git a/data/cities/deland/walgreens-north-woodland-boulevard.yml b/data/cities/deland/walgreens-north-woodland-boulevard.yml
deleted file mode 100644
index c17ce056b..000000000
--- a/data/cities/deland/walgreens-north-woodland-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 629632328
-type: node
-latitude: 29.05428
-longitude: -81.30385
-postcode: "32724"
-city: Deland
-street: North Woodland Boulevard
-housenumber: "100"
-phone: ""
-opening_hours: ""
-website: https://www.walgreens.com/locator/walgreens-100+e+international+speedway+blvd-deland-fl-32724/id=4699
diff --git a/data/cities/deland/walgreens.yml b/data/cities/deland/walgreens.yml
index 8f11c06d6..c17ce056b 100644
--- a/data/cities/deland/walgreens.yml
+++ b/data/cities/deland/walgreens.yml
@@ -1,11 +1,11 @@
-id: 631392463
+id: 629632328
 type: node
-latitude: 29.02776
-longitude: -81.29893
+latitude: 29.05428
+longitude: -81.30385
 postcode: "32724"
-city: DeLand
-street: East New York Avenue
-housenumber: "300"
+city: Deland
+street: North Woodland Boulevard
+housenumber: "100"
 phone: ""
 opening_hours: ""
-website: https://www.walgreens.com/locator/walgreens-300+e+new+york+ave-deland-fl-32724/id=13678
+website: https://www.walgreens.com/locator/walgreens-100+e+international+speedway+blvd-deland-fl-32724/id=4699
diff --git a/data/cities/fort-lauderdale/speedway-north-dixie-highway.yml b/data/cities/fort-lauderdale/speedway-north-dixie-highway.yml
deleted file mode 100644
index d4e59d0f1..000000000
--- a/data/cities/fort-lauderdale/speedway-north-dixie-highway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8827263406
-type: node
-latitude: 26.20407
-longitude: -80.13303
-postcode: "33334"
-city: Fort Lauderdale
-street: North Dixie Highway
-housenumber: "6201"
-phone: ""
-opening_hours: ""
-website: https://www.speedway.com/locations/FL/Fort-Lauderdale/6201-N-DIXIE-HWY
diff --git a/data/cities/fort-lauderdale/speedway-north-ocean-boulevard.yml b/data/cities/fort-lauderdale/speedway-north-ocean-boulevard.yml
new file mode 100644
index 000000000..fa7baa58d
--- /dev/null
+++ b/data/cities/fort-lauderdale/speedway-north-ocean-boulevard.yml
@@ -0,0 +1,11 @@
+id: 8822792089
+type: node
+latitude: 26.16718
+longitude: -80.10096
+postcode: "33308"
+city: Fort Lauderdale
+street: North Ocean Boulevard
+housenumber: "3053"
+phone: +1 954-630-9353
+opening_hours: 24/7
+website: https://www.speedway.com/locations/FL/Fort-Lauderdale/3053-N-OCEAN-BLVD
diff --git a/data/cities/fort-lauderdale/speedway.yml b/data/cities/fort-lauderdale/speedway.yml
index fa7baa58d..d4e59d0f1 100644
--- a/data/cities/fort-lauderdale/speedway.yml
+++ b/data/cities/fort-lauderdale/speedway.yml
@@ -1,11 +1,11 @@
-id: 8822792089
+id: 8827263406
 type: node
-latitude: 26.16718
-longitude: -80.10096
-postcode: "33308"
+latitude: 26.20407
+longitude: -80.13303
+postcode: "33334"
 city: Fort Lauderdale
-street: North Ocean Boulevard
-housenumber: "3053"
-phone: +1 954-630-9353
-opening_hours: 24/7
-website: https://www.speedway.com/locations/FL/Fort-Lauderdale/3053-N-OCEAN-BLVD
+street: North Dixie Highway
+housenumber: "6201"
+phone: ""
+opening_hours: ""
+website: https://www.speedway.com/locations/FL/Fort-Lauderdale/6201-N-DIXIE-HWY
diff --git a/data/cities/fort-walton-beach/publix-eglin-parkway-north.yml b/data/cities/fort-walton-beach/publix-eglin-parkway-north.yml
deleted file mode 100644
index b38a2ee81..000000000
--- a/data/cities/fort-walton-beach/publix-eglin-parkway-north.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 691063245
-type: node
-latitude: 30.44192
-longitude: -86.60073
-postcode: "32547"
-city: Fort Walton Beach
-street: Eglin Parkway North
-housenumber: "610"
-phone: +1 850-862-6789
-opening_hours: Mo-Su 07:00-22:00
-website: https://www.publix.com/locations/1303
diff --git a/data/cities/fort-walton-beach/publix-miracle-strip-parkway-southeast.yml b/data/cities/fort-walton-beach/publix-miracle-strip-parkway-southeast.yml
new file mode 100644
index 000000000..de6de620c
--- /dev/null
+++ b/data/cities/fort-walton-beach/publix-miracle-strip-parkway-southeast.yml
@@ -0,0 +1,11 @@
+id: 695757318
+type: node
+latitude: 30.40503
+longitude: -86.60321
+postcode: "32548"
+city: Fort Walton Beach
+street: Miracle Strip Parkway Southeast
+housenumber: "251"
+phone: +1 850-796-1841
+opening_hours: Mo-Su 07:00-22:00
+website: https://www.publix.com/
diff --git a/data/cities/fort-walton-beach/publix.yml b/data/cities/fort-walton-beach/publix.yml
index de6de620c..b38a2ee81 100644
--- a/data/cities/fort-walton-beach/publix.yml
+++ b/data/cities/fort-walton-beach/publix.yml
@@ -1,11 +1,11 @@
-id: 695757318
+id: 691063245
 type: node
-latitude: 30.40503
-longitude: -86.60321
-postcode: "32548"
+latitude: 30.44192
+longitude: -86.60073
+postcode: "32547"
 city: Fort Walton Beach
-street: Miracle Strip Parkway Southeast
-housenumber: "251"
-phone: +1 850-796-1841
+street: Eglin Parkway North
+housenumber: "610"
+phone: +1 850-862-6789
 opening_hours: Mo-Su 07:00-22:00
-website: https://www.publix.com/
+website: https://www.publix.com/locations/1303
diff --git a/data/cities/hollywood/dollar-tree-south-state-road-7.yml b/data/cities/hollywood/dollar-tree-south-state-road-7.yml
new file mode 100644
index 000000000..090ca3b3b
--- /dev/null
+++ b/data/cities/hollywood/dollar-tree-south-state-road-7.yml
@@ -0,0 +1,11 @@
+id: 12312623062
+type: node
+latitude: 26.00867
+longitude: -80.20837
+postcode: "33023"
+city: Hollywood
+street: South State Road 7
+housenumber: "192"
+phone: +1-754-202-4530
+opening_hours: ""
+website: ""
diff --git a/data/cities/kissimmee/ross-north-john-young-parkway.yml b/data/cities/kissimmee/ross-north-john-young-parkway.yml
deleted file mode 100644
index 4b4799e12..000000000
--- a/data/cities/kissimmee/ross-north-john-young-parkway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 3182240371
-type: node
-latitude: 28.34453
-longitude: -81.42373
-postcode: "34741"
-city: Kissimmee
-street: North John Young Parkway
-housenumber: "3202"
-phone: +1 407-343-4779
-opening_hours: Mo-Th 09:30-23:00; Fr-Sa 09:00-24:00; Su 10:00-23:00
-website: ""
diff --git a/data/cities/kissimmee/ross-rolling-oaks-boulevard.yml b/data/cities/kissimmee/ross-rolling-oaks-boulevard.yml
new file mode 100644
index 000000000..9ecdc716a
--- /dev/null
+++ b/data/cities/kissimmee/ross-rolling-oaks-boulevard.yml
@@ -0,0 +1,11 @@
+id: 3166131986
+type: node
+latitude: 28.34386
+longitude: -81.61169
+postcode: "34747"
+city: Kissimmee
+street: Rolling Oaks Boulevard
+housenumber: "3205"
+phone: +1 407-465-1748
+opening_hours: Mo-Su 08:00-22:00
+website: http://rosstores.com
diff --git a/data/cities/kissimmee/ross.yml b/data/cities/kissimmee/ross.yml
index 9ecdc716a..4b4799e12 100644
--- a/data/cities/kissimmee/ross.yml
+++ b/data/cities/kissimmee/ross.yml
@@ -1,11 +1,11 @@
-id: 3166131986
+id: 3182240371
 type: node
-latitude: 28.34386
-longitude: -81.61169
-postcode: "34747"
+latitude: 28.34453
+longitude: -81.42373
+postcode: "34741"
 city: Kissimmee
-street: Rolling Oaks Boulevard
-housenumber: "3205"
-phone: +1 407-465-1748
-opening_hours: Mo-Su 08:00-22:00
-website: http://rosstores.com
+street: North John Young Parkway
+housenumber: "3202"
+phone: +1 407-343-4779
+opening_hours: Mo-Th 09:30-23:00; Fr-Sa 09:00-24:00; Su 10:00-23:00
+website: ""
diff --git a/data/cities/masaryktown/dollar-general.yml b/data/cities/masaryktown/dollar-general.yml
new file mode 100644
index 000000000..4a00a45ca
--- /dev/null
+++ b/data/cities/masaryktown/dollar-general.yml
@@ -0,0 +1,11 @@
+id: 1329511772
+type: node
+latitude: 28.44233
+longitude: -82.45801
+postcode: "34604"
+city: Masaryktown
+street: Broad Street
+housenumber: "399"
+phone: +1 352 251 3080
+opening_hours: 08:00-22:00
+website: ""
diff --git a/data/cities/miami-beach/glowvita.yml b/data/cities/miami-beach/glowvita.yml
index a8c7ca0d2..fb0379975 100644
--- a/data/cities/miami-beach/glowvita.yml
+++ b/data/cities/miami-beach/glowvita.yml
@@ -7,5 +7,5 @@ city: Miami Beach
 street: Washington Avenue
 housenumber: "110"
 phone: +1 305 6766866
-opening_hours: 'Mo–Fr: 09:00–19:00; Sa: 10:00–16:00; Su: off'
+opening_hours: 'Mo-Fr: 09:00-19:00; Sa: 10:00-16:00; Su: off'
 website: https://glowvitamedspa.com/
diff --git a/data/cities/miami-beach/lululemon-lincoln-road.yml b/data/cities/miami-beach/lululemon-lincoln-road.yml
index 9e4e7777c..a20c8bb93 100644
--- a/data/cities/miami-beach/lululemon-lincoln-road.yml
+++ b/data/cities/miami-beach/lululemon-lincoln-road.yml
@@ -1,11 +1,11 @@
-id: 7144641141
+id: 7144016013
 type: node
 latitude: 25.79038
-longitude: -80.13689
+longitude: -80.13749
 postcode: "33139"
 city: Miami Beach
 street: Lincoln Road
-housenumber: "810"
+housenumber: "846"
 phone: ""
 opening_hours: ""
-website: ""
+website: https://shop.lululemon.com/stores/us/miami/lincolnroad
diff --git a/data/cities/miami-beach/lululemon.yml b/data/cities/miami-beach/lululemon.yml
index a20c8bb93..9e4e7777c 100644
--- a/data/cities/miami-beach/lululemon.yml
+++ b/data/cities/miami-beach/lululemon.yml
@@ -1,11 +1,11 @@
-id: 7144016013
+id: 7144641141
 type: node
 latitude: 25.79038
-longitude: -80.13749
+longitude: -80.13689
 postcode: "33139"
 city: Miami Beach
 street: Lincoln Road
-housenumber: "846"
+housenumber: "810"
 phone: ""
 opening_hours: ""
-website: https://shop.lululemon.com/stores/us/miami/lincolnroad
+website: ""
diff --git a/data/cities/miami/fluent-north-kendall-drive.yml b/data/cities/miami/fluent-north-kendall-drive.yml
deleted file mode 100644
index ddd785d5e..000000000
--- a/data/cities/miami/fluent-north-kendall-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 435579101
-type: node
-latitude: 25.68792
-longitude: -80.34901
-postcode: "33176"
-city: Miami
-street: North Kendall Drive
-housenumber: "9611"
-phone: +1-833-735-8368
-opening_hours: Mo-Su 09:00-20:30
-website: https://getfluent.com/dispensaries/kendall/
diff --git a/data/cities/miami/fluent-southwest-211th-street.yml b/data/cities/miami/fluent-southwest-211th-street.yml
new file mode 100644
index 000000000..3192adc8a
--- /dev/null
+++ b/data/cities/miami/fluent-southwest-211th-street.yml
@@ -0,0 +1,11 @@
+id: 435881455
+type: node
+latitude: 25.57165
+longitude: -80.37311
+postcode: "33189"
+city: Miami
+street: Southwest 211th Street
+housenumber: "11245"
+phone: ""
+opening_hours: Mo-Su 09:00-20:30
+website: https://getfluent.com/dispensaries/cutler-bay/
diff --git a/data/cities/miami/fluent.yml b/data/cities/miami/fluent.yml
index 3192adc8a..ddd785d5e 100644
--- a/data/cities/miami/fluent.yml
+++ b/data/cities/miami/fluent.yml
@@ -1,11 +1,11 @@
-id: 435881455
+id: 435579101
 type: node
-latitude: 25.57165
-longitude: -80.37311
-postcode: "33189"
+latitude: 25.68792
+longitude: -80.34901
+postcode: "33176"
 city: Miami
-street: Southwest 211th Street
-housenumber: "11245"
-phone: ""
+street: North Kendall Drive
+housenumber: "9611"
+phone: +1-833-735-8368
 opening_hours: Mo-Su 09:00-20:30
-website: https://getfluent.com/dispensaries/cutler-bay/
+website: https://getfluent.com/dispensaries/kendall/
diff --git a/data/cities/miami/the-home-depot-southwest-32nd-avenue.yml b/data/cities/miami/the-home-depot-southwest-32nd-avenue.yml
deleted file mode 100644
index cac95a5b8..000000000
--- a/data/cities/miami/the-home-depot-southwest-32nd-avenue.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 301295333
-type: node
-latitude: 25.73652
-longitude: -80.24474
-postcode: "33133"
-city: Miami
-street: Southwest 32nd Avenue
-housenumber: "2999"
-phone: +1 305-443-3534
-opening_hours: Mo-Sa 06:00-20:00; Su 07:00-20:00
-website: https://www.homedepot.com/l/Coconut-Grove/FL/Miami/33133/6856
diff --git a/data/cities/miami/the-home-depot-west-flagler-street.yml b/data/cities/miami/the-home-depot-west-flagler-street.yml
new file mode 100644
index 000000000..242611e09
--- /dev/null
+++ b/data/cities/miami/the-home-depot-west-flagler-street.yml
@@ -0,0 +1,11 @@
+id: 307737096
+type: node
+latitude: 25.77472
+longitude: -80.32415
+postcode: "33144"
+city: Miami
+street: West Flagler Street
+housenumber: "7899"
+phone: +1-786-388-9108
+opening_hours: ""
+website: https://www.homedepot.com/l/Flagler-II/FL/Miami/33144/6343
diff --git a/data/cities/miami/the-home-depot.yml b/data/cities/miami/the-home-depot.yml
index 242611e09..cac95a5b8 100644
--- a/data/cities/miami/the-home-depot.yml
+++ b/data/cities/miami/the-home-depot.yml
@@ -1,11 +1,11 @@
-id: 307737096
+id: 301295333
 type: node
-latitude: 25.77472
-longitude: -80.32415
-postcode: "33144"
+latitude: 25.73652
+longitude: -80.24474
+postcode: "33133"
 city: Miami
-street: West Flagler Street
-housenumber: "7899"
-phone: +1-786-388-9108
-opening_hours: ""
-website: https://www.homedepot.com/l/Flagler-II/FL/Miami/33144/6343
+street: Southwest 32nd Avenue
+housenumber: "2999"
+phone: +1 305-443-3534
+opening_hours: Mo-Sa 06:00-20:00; Su 07:00-20:00
+website: https://www.homedepot.com/l/Coconut-Grove/FL/Miami/33133/6856
diff --git a/data/cities/naples/speedway-golden-gate-parkway.yml b/data/cities/naples/speedway-golden-gate-parkway.yml
deleted file mode 100644
index 9e7ef30a7..000000000
--- a/data/cities/naples/speedway-golden-gate-parkway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8855510936
-type: node
-latitude: 26.17844
-longitude: -81.70845
-postcode: "34116"
-city: Naples
-street: Golden Gate Parkway
-housenumber: "5100"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/naples/speedway-goodlette-road-north.yml b/data/cities/naples/speedway-goodlette-road-north.yml
new file mode 100644
index 000000000..55ca0625f
--- /dev/null
+++ b/data/cities/naples/speedway-goodlette-road-north.yml
@@ -0,0 +1,11 @@
+id: 8855483791
+type: node
+latitude: 26.17133
+longitude: -81.7908
+postcode: "34102"
+city: Naples
+street: Goodlette Road North
+housenumber: "2100"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/naples/speedway.yml b/data/cities/naples/speedway.yml
index 55ca0625f..9e7ef30a7 100644
--- a/data/cities/naples/speedway.yml
+++ b/data/cities/naples/speedway.yml
@@ -1,11 +1,11 @@
-id: 8855483791
+id: 8855510936
 type: node
-latitude: 26.17133
-longitude: -81.7908
-postcode: "34102"
+latitude: 26.17844
+longitude: -81.70845
+postcode: "34116"
 city: Naples
-street: Goodlette Road North
-housenumber: "2100"
+street: Golden Gate Parkway
+housenumber: "5100"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/naples/the-home-depot-airport-pulling-road-south.yml b/data/cities/naples/the-home-depot-airport-pulling-road-south.yml
new file mode 100644
index 000000000..11e991d07
--- /dev/null
+++ b/data/cities/naples/the-home-depot-airport-pulling-road-south.yml
@@ -0,0 +1,11 @@
+id: 523891780
+type: node
+latitude: 26.13813
+longitude: -81.76473
+postcode: "34112"
+city: Naples
+street: Airport Pulling Road South
+housenumber: "1651"
+phone: +1 239-793-2203
+opening_hours: Mo-Sa 06:00-22:00; Su 07:00-20:00
+website: https://www.homedepot.com/l/south-naples/fl/naples/34112/6348
diff --git a/data/cities/naples/the-home-depot-pine-ridge-road.yml b/data/cities/naples/the-home-depot-pine-ridge-road.yml
deleted file mode 100644
index 16aaafdc5..000000000
--- a/data/cities/naples/the-home-depot-pine-ridge-road.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 524091237
-type: node
-latitude: 26.2137
-longitude: -81.77409
-postcode: "34109"
-city: Naples
-street: Pine Ridge Road
-housenumber: "2251"
-phone: +1 239-597-1515
-opening_hours: Mo-Sa 06:00-22:00; Su 07:00-20:00
-website: https://www.homedepot.com/l/naples/fl/naples/34109/280
diff --git a/data/cities/naples/the-home-depot.yml b/data/cities/naples/the-home-depot.yml
index 11e991d07..16aaafdc5 100644
--- a/data/cities/naples/the-home-depot.yml
+++ b/data/cities/naples/the-home-depot.yml
@@ -1,11 +1,11 @@
-id: 523891780
+id: 524091237
 type: node
-latitude: 26.13813
-longitude: -81.76473
-postcode: "34112"
+latitude: 26.2137
+longitude: -81.77409
+postcode: "34109"
 city: Naples
-street: Airport Pulling Road South
-housenumber: "1651"
-phone: +1 239-793-2203
+street: Pine Ridge Road
+housenumber: "2251"
+phone: +1 239-597-1515
 opening_hours: Mo-Sa 06:00-22:00; Su 07:00-20:00
-website: https://www.homedepot.com/l/south-naples/fl/naples/34112/6348
+website: https://www.homedepot.com/l/naples/fl/naples/34109/280
diff --git a/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail-2.yml b/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail-2.yml
index 6959bab2b..0f5fe577d 100644
--- a/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail-2.yml
+++ b/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail-2.yml
@@ -1,11 +1,11 @@
-id: 313780343
+id: 298219824
 type: node
-latitude: 28.47309
-longitude: -81.39607
-postcode: "32839"
+latitude: 28.36868
+longitude: -81.40548
+postcode: "32837"
 city: Orlando
 street: South Orange Blossom Trail
-housenumber: "5899"
+housenumber: "13454"
 phone: ""
-opening_hours: Mo-Su 07:00-22:00
-website: https://www.cvs.com/store-locator/orlando-fl-pharmacies/5899-orange-blossom-trl-orlando-fl-32839/storeid=204
+opening_hours: Mo-Fr 08:30-19:30;Sa-Su 08:30-17:30
+website: https://www.cvs.com/store-locator/orlando-fl-pharmacies/13454-s-orange-blossom-tr-orlando-fl-32837/storeid=5852
diff --git a/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail.yml b/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail.yml
index 0f5fe577d..6959bab2b 100644
--- a/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail.yml
+++ b/data/cities/orlando/cvs-pharmacy-south-orange-blossom-trail.yml
@@ -1,11 +1,11 @@
-id: 298219824
+id: 313780343
 type: node
-latitude: 28.36868
-longitude: -81.40548
-postcode: "32837"
+latitude: 28.47309
+longitude: -81.39607
+postcode: "32839"
 city: Orlando
 street: South Orange Blossom Trail
-housenumber: "13454"
+housenumber: "5899"
 phone: ""
-opening_hours: Mo-Fr 08:30-19:30;Sa-Su 08:30-17:30
-website: https://www.cvs.com/store-locator/orlando-fl-pharmacies/13454-s-orange-blossom-tr-orlando-fl-32837/storeid=5852
+opening_hours: Mo-Su 07:00-22:00
+website: https://www.cvs.com/store-locator/orlando-fl-pharmacies/5899-orange-blossom-trl-orlando-fl-32839/storeid=204
diff --git a/data/cities/orlando/the-master-barber-experience.yml b/data/cities/orlando/the-master-barber-experience.yml
new file mode 100644
index 000000000..e1d97dc0c
--- /dev/null
+++ b/data/cities/orlando/the-master-barber-experience.yml
@@ -0,0 +1,11 @@
+id: 12306446786
+type: node
+latitude: 28.37253
+longitude: -81.27859
+postcode: "32827"
+city: Orlando
+street: Tavistock Lakes Boulevard
+housenumber: "6900"
+phone: +1-407-607-4295
+opening_hours: ""
+website: https://www.themasterbarberexperience.com/
diff --git a/data/cities/palm-coast/texaco-xpress-lube.yml b/data/cities/palm-coast/texaco-xpress-lube.yml
index 7491d4026..313da8232 100644
--- a/data/cities/palm-coast/texaco-xpress-lube.yml
+++ b/data/cities/palm-coast/texaco-xpress-lube.yml
@@ -1,7 +1,7 @@
 id: 488891966
 type: node
 latitude: 29.55403
-longitude: -81.23034
+longitude: -81.23035
 postcode: "32137"
 city: Palm Coast
 street: ""
diff --git a/data/cities/palm-coast/z-best-rental.yml b/data/cities/palm-coast/z-best-rental.yml
index 1a7ca0035..d7b784613 100644
--- a/data/cities/palm-coast/z-best-rental.yml
+++ b/data/cities/palm-coast/z-best-rental.yml
@@ -1,7 +1,7 @@
 id: 270497949
 type: node
-latitude: 29.55407
-longitude: -81.24874
+latitude: 29.55408
+longitude: -81.24872
 postcode: "32137"
 city: Palm Coast
 street: Palm Coast Parkway Northwest
diff --git a/data/cities/panama-city/dollar-general-east-5th-street.yml b/data/cities/panama-city/dollar-general-east-5th-street.yml
deleted file mode 100644
index 7039ce89f..000000000
--- a/data/cities/panama-city/dollar-general-east-5th-street.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 637348090
-type: node
-latitude: 30.15656
-longitude: -85.63019
-postcode: "32401"
-city: Panama City
-street: East 5th Street
-housenumber: "2226"
-phone: ""
-opening_hours: ""
-website: https://www.dollargeneral.com/store-directory/fl/panama-city/20794
diff --git a/data/cities/panama-city/dollar-general-west-18th-street.yml b/data/cities/panama-city/dollar-general-west-18th-street.yml
new file mode 100644
index 000000000..df6ea2d3c
--- /dev/null
+++ b/data/cities/panama-city/dollar-general-west-18th-street.yml
@@ -0,0 +1,11 @@
+id: 634487954
+type: node
+latitude: 30.18149
+longitude: -85.71195
+postcode: "32405"
+city: Panama City
+street: West 18th Street
+housenumber: ""
+phone: ""
+opening_hours: ""
+website: https://www.dollargeneral.com/store-directory/fl/panama-city/15709
diff --git a/data/cities/panama-city/dollar-general.yml b/data/cities/panama-city/dollar-general.yml
index df6ea2d3c..7039ce89f 100644
--- a/data/cities/panama-city/dollar-general.yml
+++ b/data/cities/panama-city/dollar-general.yml
@@ -1,11 +1,11 @@
-id: 634487954
+id: 637348090
 type: node
-latitude: 30.18149
-longitude: -85.71195
-postcode: "32405"
+latitude: 30.15656
+longitude: -85.63019
+postcode: "32401"
 city: Panama City
-street: West 18th Street
-housenumber: ""
+street: East 5th Street
+housenumber: "2226"
 phone: ""
 opening_hours: ""
-website: https://www.dollargeneral.com/store-directory/fl/panama-city/15709
+website: https://www.dollargeneral.com/store-directory/fl/panama-city/20794
diff --git a/data/cities/pensacola/boost-mobile-north-pace-boulevard.yml b/data/cities/pensacola/boost-mobile-north-pace-boulevard.yml
new file mode 100644
index 000000000..0552842a9
--- /dev/null
+++ b/data/cities/pensacola/boost-mobile-north-pace-boulevard.yml
@@ -0,0 +1,11 @@
+id: 7727429047
+type: node
+latitude: 30.44676
+longitude: -87.23766
+postcode: "32505"
+city: Pensacola
+street: North Pace Boulevard
+housenumber: "3300"
+phone: ""
+opening_hours: Mo,We-Fr 09:30-19:30; Tu 09:00-19:30; Sa 09:30-19:00; Su 12:00-18:00
+website: ""
diff --git a/data/cities/pensacola/boost-mobile-west-fairfield-drive.yml b/data/cities/pensacola/boost-mobile-west-fairfield-drive.yml
deleted file mode 100644
index caed1444c..000000000
--- a/data/cities/pensacola/boost-mobile-west-fairfield-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 7734775940
-type: node
-latitude: 30.4321
-longitude: -87.29644
-postcode: "32506"
-city: Pensacola
-street: West Fairfield Drive
-housenumber: "6100"
-phone: ""
-opening_hours: Mo-Sa 10:00-19:00; Su 12:00-17:00
-website: ""
diff --git a/data/cities/pensacola/boost-mobile.yml b/data/cities/pensacola/boost-mobile.yml
index 0552842a9..caed1444c 100644
--- a/data/cities/pensacola/boost-mobile.yml
+++ b/data/cities/pensacola/boost-mobile.yml
@@ -1,11 +1,11 @@
-id: 7727429047
+id: 7734775940
 type: node
-latitude: 30.44676
-longitude: -87.23766
-postcode: "32505"
+latitude: 30.4321
+longitude: -87.29644
+postcode: "32506"
 city: Pensacola
-street: North Pace Boulevard
-housenumber: "3300"
+street: West Fairfield Drive
+housenumber: "6100"
 phone: ""
-opening_hours: Mo,We-Fr 09:30-19:30; Tu 09:00-19:30; Sa 09:30-19:00; Su 12:00-18:00
+opening_hours: Mo-Sa 10:00-19:00; Su 12:00-17:00
 website: ""
diff --git a/data/cities/pensacola/dollar-tree-mobile-highway.yml b/data/cities/pensacola/dollar-tree-mobile-highway.yml
deleted file mode 100644
index 822d76657..000000000
--- a/data/cities/pensacola/dollar-tree-mobile-highway.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 355032025
-type: node
-latitude: 30.43527
-longitude: -87.27567
-postcode: "32506"
-city: Pensacola
-street: Mobile Highway
-housenumber: "4510"
-phone: ""
-opening_hours: Mo-Sa 08:00-21:00; Su 09:00-20:00
-website: https://www.dollartree.com/locations/fl/pensacola/948/
diff --git a/data/cities/pensacola/dollar-tree-north-davis-highway.yml b/data/cities/pensacola/dollar-tree-north-davis-highway.yml
new file mode 100644
index 000000000..61e30fe0c
--- /dev/null
+++ b/data/cities/pensacola/dollar-tree-north-davis-highway.yml
@@ -0,0 +1,11 @@
+id: 354176727
+type: node
+latitude: 30.51183
+longitude: -87.21769
+postcode: "32514"
+city: Pensacola
+street: North Davis Highway
+housenumber: "8102"
+phone: +1 850-479-3768
+opening_hours: Mo-Sa 08:00-22:00; Su 10:00-20:00
+website: https://www.dollartree.com/locations/fl/pensacola/4466/
diff --git a/data/cities/pensacola/dollar-tree.yml b/data/cities/pensacola/dollar-tree.yml
index 61e30fe0c..822d76657 100644
--- a/data/cities/pensacola/dollar-tree.yml
+++ b/data/cities/pensacola/dollar-tree.yml
@@ -1,11 +1,11 @@
-id: 354176727
+id: 355032025
 type: node
-latitude: 30.51183
-longitude: -87.21769
-postcode: "32514"
+latitude: 30.43527
+longitude: -87.27567
+postcode: "32506"
 city: Pensacola
-street: North Davis Highway
-housenumber: "8102"
-phone: +1 850-479-3768
-opening_hours: Mo-Sa 08:00-22:00; Su 10:00-20:00
-website: https://www.dollartree.com/locations/fl/pensacola/4466/
+street: Mobile Highway
+housenumber: "4510"
+phone: ""
+opening_hours: Mo-Sa 08:00-21:00; Su 09:00-20:00
+website: https://www.dollartree.com/locations/fl/pensacola/948/
diff --git a/data/cities/pinellas-park/gamestop-park-blvd.yml b/data/cities/pinellas-park/gamestop-park-blvd.yml
index a3324f6b8..36f418018 100644
--- a/data/cities/pinellas-park/gamestop-park-blvd.yml
+++ b/data/cities/pinellas-park/gamestop-park-blvd.yml
@@ -1,11 +1,11 @@
-id: 2030672189
+id: 1770048453
 type: node
-latitude: 27.83957
-longitude: -82.73841
+latitude: 27.83878
+longitude: -82.68478
 postcode: "33781"
 city: Pinellas Park
 street: Park Blvd
-housenumber: "7259"
-phone: +1-727-547-6027
+housenumber: "3720"
+phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/pinellas-park/gamestop.yml b/data/cities/pinellas-park/gamestop.yml
index 36f418018..a3324f6b8 100644
--- a/data/cities/pinellas-park/gamestop.yml
+++ b/data/cities/pinellas-park/gamestop.yml
@@ -1,11 +1,11 @@
-id: 1770048453
+id: 2030672189
 type: node
-latitude: 27.83878
-longitude: -82.68478
+latitude: 27.83957
+longitude: -82.73841
 postcode: "33781"
 city: Pinellas Park
 street: Park Blvd
-housenumber: "3720"
-phone: ""
+housenumber: "7259"
+phone: +1-727-547-6027
 opening_hours: ""
 website: ""
diff --git a/data/cities/port-orange/cumberland-farms.yml b/data/cities/port-orange/cumberland-farms.yml
index e3d0454e1..6159d313f 100644
--- a/data/cities/port-orange/cumberland-farms.yml
+++ b/data/cities/port-orange/cumberland-farms.yml
@@ -1,7 +1,7 @@
 id: 5070508931
 type: node
-latitude: 29.1425
-longitude: -81.03451
+latitude: 29.14249
+longitude: -81.0345
 postcode: "32129"
 city: Port Orange
 street: South Clyde Morris Boulevard
diff --git a/data/cities/port-saint-lucie/racetrac-south-us-highway-1.yml b/data/cities/port-saint-lucie/racetrac-south-us-highway-1.yml
new file mode 100644
index 000000000..3a8804d87
--- /dev/null
+++ b/data/cities/port-saint-lucie/racetrac-south-us-highway-1.yml
@@ -0,0 +1,11 @@
+id: 766725641
+type: node
+latitude: 27.31123
+longitude: -80.3109
+postcode: "34952"
+city: Port Saint Lucie
+street: South US Highway 1
+housenumber: "8630"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/port-saint-lucie/racetrac-southwest-port-saint-lucie-boulevard.yml b/data/cities/port-saint-lucie/racetrac-southwest-port-saint-lucie-boulevard.yml
deleted file mode 100644
index ca72c7db1..000000000
--- a/data/cities/port-saint-lucie/racetrac-southwest-port-saint-lucie-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 762582961
-type: node
-latitude: 27.27493
-longitude: -80.35163
-postcode: "34953"
-city: Port Saint Lucie
-street: Southwest Port Saint Lucie Boulevard
-housenumber: "221"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/port-saint-lucie/racetrac.yml b/data/cities/port-saint-lucie/racetrac.yml
index 3a8804d87..ca72c7db1 100644
--- a/data/cities/port-saint-lucie/racetrac.yml
+++ b/data/cities/port-saint-lucie/racetrac.yml
@@ -1,11 +1,11 @@
-id: 766725641
+id: 762582961
 type: node
-latitude: 27.31123
-longitude: -80.3109
-postcode: "34952"
+latitude: 27.27493
+longitude: -80.35163
+postcode: "34953"
 city: Port Saint Lucie
-street: South US Highway 1
-housenumber: "8630"
+street: Southwest Port Saint Lucie Boulevard
+housenumber: "221"
 phone: ""
 opening_hours: ""
 website: ""
diff --git a/data/cities/saint-petersburg/metro-by-t-mobile-4th-street-north.yml b/data/cities/saint-petersburg/metro-by-t-mobile-4th-street-north.yml
index 439435599..2a6b2157f 100644
--- a/data/cities/saint-petersburg/metro-by-t-mobile-4th-street-north.yml
+++ b/data/cities/saint-petersburg/metro-by-t-mobile-4th-street-north.yml
@@ -1,11 +1,11 @@
-id: 1817834865
+id: 1765787083
 type: node
-latitude: 27.8724
-longitude: -82.63965
-postcode: "33716"
+latitude: 27.81959
+longitude: -82.63825
+postcode: ""
 city: Saint Petersburg
 street: 4th Street North
 housenumber: ""
 phone: ""
 opening_hours: ""
-website: ""
+website: https://www.metrobyt-mobile.com/stores/bd/metro-by-t-mobile-st-petersburg-fl-10215883/
diff --git a/data/cities/saint-petersburg/metro-by-t-mobile.yml b/data/cities/saint-petersburg/metro-by-t-mobile.yml
index 2a6b2157f..439435599 100644
--- a/data/cities/saint-petersburg/metro-by-t-mobile.yml
+++ b/data/cities/saint-petersburg/metro-by-t-mobile.yml
@@ -1,11 +1,11 @@
-id: 1765787083
+id: 1817834865
 type: node
-latitude: 27.81959
-longitude: -82.63825
-postcode: ""
+latitude: 27.8724
+longitude: -82.63965
+postcode: "33716"
 city: Saint Petersburg
 street: 4th Street North
 housenumber: ""
 phone: ""
 opening_hours: ""
-website: https://www.metrobyt-mobile.com/stores/bd/metro-by-t-mobile-st-petersburg-fl-10215883/
+website: ""
diff --git a/data/cities/sarasota/gauthier-salon-and-wellness-spa.yml b/data/cities/sarasota/gauthier-salon-and-wellness-spa.yml
new file mode 100644
index 000000000..1aedb98ca
--- /dev/null
+++ b/data/cities/sarasota/gauthier-salon-and-wellness-spa.yml
@@ -0,0 +1,11 @@
+id: 12309602713
+type: node
+latitude: 27.31861
+longitude: -82.57802
+postcode: "34236"
+city: Sarasota
+street: Saint Armands Circle
+housenumber: "369"
+phone: +1 941-388-5500
+opening_hours: Tu-Fr 10:00-18:00; Sa 10:00-17:00
+website: https://www.gauthier.salon/
diff --git a/data/cities/sunrise/walmart-supercenter-north-university-drive.yml b/data/cities/sunrise/walmart-supercenter-north-university-drive.yml
deleted file mode 100644
index ea50222ba..000000000
--- a/data/cities/sunrise/walmart-supercenter-north-university-drive.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 246971964
-type: node
-latitude: 26.16826
-longitude: -80.25379
-postcode: "33351"
-city: Sunrise
-street: North University Drive
-housenumber: "3306"
-phone: +1 954-749-3111
-opening_hours: 24/7
-website: https://www.walmart.com/store/1349-sunrise-fl
diff --git a/data/cities/sunrise/walmart-supercenter-west-sunrise-boulevard.yml b/data/cities/sunrise/walmart-supercenter-west-sunrise-boulevard.yml
new file mode 100644
index 000000000..5d370c7cd
--- /dev/null
+++ b/data/cities/sunrise/walmart-supercenter-west-sunrise-boulevard.yml
@@ -0,0 +1,11 @@
+id: 219202538
+type: node
+latitude: 26.14808
+longitude: -80.31879
+postcode: "33323"
+city: Sunrise
+street: West Sunrise Boulevard
+housenumber: "12555"
+phone: +1 954-845-0581
+opening_hours: 24/7
+website: https://www.walmart.com/store/2151-sunrise-fl
diff --git a/data/cities/sunrise/walmart-supercenter.yml b/data/cities/sunrise/walmart-supercenter.yml
index 5d370c7cd..ea50222ba 100644
--- a/data/cities/sunrise/walmart-supercenter.yml
+++ b/data/cities/sunrise/walmart-supercenter.yml
@@ -1,11 +1,11 @@
-id: 219202538
+id: 246971964
 type: node
-latitude: 26.14808
-longitude: -80.31879
-postcode: "33323"
+latitude: 26.16826
+longitude: -80.25379
+postcode: "33351"
 city: Sunrise
-street: West Sunrise Boulevard
-housenumber: "12555"
-phone: +1 954-845-0581
+street: North University Drive
+housenumber: "3306"
+phone: +1 954-749-3111
 opening_hours: 24/7
-website: https://www.walmart.com/store/2151-sunrise-fl
+website: https://www.walmart.com/store/1349-sunrise-fl
diff --git a/data/cities/tampa/aarons-north-armenia-avenue.yml b/data/cities/tampa/aarons-north-armenia-avenue.yml
deleted file mode 100644
index 0899af234..000000000
--- a/data/cities/tampa/aarons-north-armenia-avenue.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 2002531622
-type: node
-latitude: 27.99703
-longitude: -82.48417
-postcode: "33614"
-city: Tampa
-street: North Armenia Avenue
-housenumber: ""
-phone: ""
-opening_hours: Mo-Fr 11:00-19:00; Sa 10:00-17:00; Su closed
-website: https://locations.aarons.com/us/fl/tampa/5501-n-armenia-ave
diff --git a/data/cities/tampa/aarons-north-florida-avenue.yml b/data/cities/tampa/aarons-north-florida-avenue.yml
new file mode 100644
index 000000000..b6cd8881d
--- /dev/null
+++ b/data/cities/tampa/aarons-north-florida-avenue.yml
@@ -0,0 +1,11 @@
+id: 2013020159
+type: node
+latitude: 28.03177
+longitude: -82.45985
+postcode: "33604"
+city: Tampa
+street: North Florida Avenue
+housenumber: ""
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/tampa/aarons.yml b/data/cities/tampa/aarons.yml
index b6cd8881d..0899af234 100644
--- a/data/cities/tampa/aarons.yml
+++ b/data/cities/tampa/aarons.yml
@@ -1,11 +1,11 @@
-id: 2013020159
+id: 2002531622
 type: node
-latitude: 28.03177
-longitude: -82.45985
-postcode: "33604"
+latitude: 27.99703
+longitude: -82.48417
+postcode: "33614"
 city: Tampa
-street: North Florida Avenue
+street: North Armenia Avenue
 housenumber: ""
 phone: ""
-opening_hours: ""
-website: ""
+opening_hours: Mo-Fr 11:00-19:00; Sa 10:00-17:00; Su closed
+website: https://locations.aarons.com/us/fl/tampa/5501-n-armenia-ave
diff --git a/data/cities/tampa/mikes-auto-glass-express.yml b/data/cities/tampa/mikes-auto-glass-express.yml
new file mode 100644
index 000000000..4d9e2428a
--- /dev/null
+++ b/data/cities/tampa/mikes-auto-glass-express.yml
@@ -0,0 +1,11 @@
+id: 12313719390
+type: node
+latitude: 28.02772
+longitude: -82.45993
+postcode: "33604"
+city: Tampa
+street: North Florida Avenue
+housenumber: "8512"
+phone: +1-813-833-2973
+opening_hours: Mo-Fr 08:00-17:00
+website: https://www.nationsautoglass.com
diff --git a/data/cities/tampa/mikes-auto-glass-tampa.yml b/data/cities/tampa/mikes-auto-glass-tampa.yml
new file mode 100644
index 000000000..e160b5397
--- /dev/null
+++ b/data/cities/tampa/mikes-auto-glass-tampa.yml
@@ -0,0 +1,11 @@
+id: 12313856981
+type: node
+latitude: 27.99081
+longitude: -82.48412
+postcode: "33603"
+city: Tampa
+street: North Armenia Avenue
+housenumber: "4901"
+phone: +1-813-876-4115
+opening_hours: Mo-Fr 08:00-17:00
+website: ""
diff --git a/data/cities/tampa/mobil-mart-east-hillsborough-avenue-2.yml b/data/cities/tampa/mobil-mart-east-hillsborough-avenue-2.yml
index 364c4066e..48729a2ef 100644
--- a/data/cities/tampa/mobil-mart-east-hillsborough-avenue-2.yml
+++ b/data/cities/tampa/mobil-mart-east-hillsborough-avenue-2.yml
@@ -1,11 +1,11 @@
-id: 1153591333
+id: 1151660469
 type: node
-latitude: 27.99574
-longitude: -82.45498
-postcode: "33604"
+latitude: 27.99581
+longitude: -82.3736
+postcode: "33610"
 city: Tampa
 street: East Hillsborough Avenue
-housenumber: "501"
-phone: +1-813-443-8341
-opening_hours: Mo-Fr 05:00-23:00, Sa 06:00-23:00, Su 07:00-23:00
-website: https://www.exxon.com/en/find-station/mobil-tampa-fl-centralmart-200322343
+housenumber: "7209"
+phone: +1-813-626-1008
+opening_hours: 24/7
+website: https://www.exxon.com/en/find-station/mobil-tampa-fl-orientmobil-200314793
diff --git a/data/cities/tampa/mobil-mart-east-hillsborough-avenue.yml b/data/cities/tampa/mobil-mart-east-hillsborough-avenue.yml
index 48729a2ef..364c4066e 100644
--- a/data/cities/tampa/mobil-mart-east-hillsborough-avenue.yml
+++ b/data/cities/tampa/mobil-mart-east-hillsborough-avenue.yml
@@ -1,11 +1,11 @@
-id: 1151660469
+id: 1153591333
 type: node
-latitude: 27.99581
-longitude: -82.3736
-postcode: "33610"
+latitude: 27.99574
+longitude: -82.45498
+postcode: "33604"
 city: Tampa
 street: East Hillsborough Avenue
-housenumber: "7209"
-phone: +1-813-626-1008
-opening_hours: 24/7
-website: https://www.exxon.com/en/find-station/mobil-tampa-fl-orientmobil-200314793
+housenumber: "501"
+phone: +1-813-443-8341
+opening_hours: Mo-Fr 05:00-23:00, Sa 06:00-23:00, Su 07:00-23:00
+website: https://www.exxon.com/en/find-station/mobil-tampa-fl-centralmart-200322343
diff --git a/data/cities/tampa/moramoto-of-tampa-bay.yml b/data/cities/tampa/moramoto-of-tampa-bay.yml
index a0101ede0..13f08e8d5 100644
--- a/data/cities/tampa/moramoto-of-tampa-bay.yml
+++ b/data/cities/tampa/moramoto-of-tampa-bay.yml
@@ -7,5 +7,5 @@ city: Tampa
 street: N Dale Mabry Hwy
 housenumber: "7807"
 phone: 813-512-6888
-opening_hours: 'Tue - Fri : 9 AM–6 PM || Sat: 9 AM–5 PM || Sunday – Monday : Closed'
+opening_hours: 'Tue - Fri : 9 AM-6 PM || Sat: 9 AM-5 PM || Sunday - Monday : Closed'
 website: https://www.moramoto.com/
diff --git a/data/cities/tampa/the-home-depot-adamo-drive.yml b/data/cities/tampa/the-home-depot-adamo-drive.yml
new file mode 100644
index 000000000..1ab091cc5
--- /dev/null
+++ b/data/cities/tampa/the-home-depot-adamo-drive.yml
@@ -0,0 +1,11 @@
+id: 54191679
+type: node
+latitude: 27.94358
+longitude: -82.34069
+postcode: "33619"
+city: Tampa
+street: Adamo Drive
+housenumber: "9941"
+phone: +1 813-664-0042
+opening_hours: Mo-Sa 06:00-21:00; Su 08:00-20:00
+website: https://www.homedepot.com/l/brandon/fl/tampa/33619/243
diff --git a/data/cities/tampa/the-home-depot-bruce-b-downs-boulevard.yml b/data/cities/tampa/the-home-depot-bruce-b-downs-boulevard.yml
deleted file mode 100644
index 30191dea7..000000000
--- a/data/cities/tampa/the-home-depot-bruce-b-downs-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 31910877
-type: node
-latitude: 28.12898
-longitude: -82.36478
-postcode: "33647"
-city: Tampa
-street: Bruce B Downs Boulevard
-housenumber: "17601"
-phone: +1 813-971-7791
-opening_hours: Mo-Sa 06:00-22:00; Su 08:00-20:00
-website: https://www.homedepot.com/l/Bruce-B-Downs/FL/Tampa/33647/6311
diff --git a/data/cities/tampa/the-home-depot.yml b/data/cities/tampa/the-home-depot.yml
index 1ab091cc5..30191dea7 100644
--- a/data/cities/tampa/the-home-depot.yml
+++ b/data/cities/tampa/the-home-depot.yml
@@ -1,11 +1,11 @@
-id: 54191679
+id: 31910877
 type: node
-latitude: 27.94358
-longitude: -82.34069
-postcode: "33619"
+latitude: 28.12898
+longitude: -82.36478
+postcode: "33647"
 city: Tampa
-street: Adamo Drive
-housenumber: "9941"
-phone: +1 813-664-0042
-opening_hours: Mo-Sa 06:00-21:00; Su 08:00-20:00
-website: https://www.homedepot.com/l/brandon/fl/tampa/33619/243
+street: Bruce B Downs Boulevard
+housenumber: "17601"
+phone: +1 813-971-7791
+opening_hours: Mo-Sa 06:00-22:00; Su 08:00-20:00
+website: https://www.homedepot.com/l/Bruce-B-Downs/FL/Tampa/33647/6311
diff --git a/data/cities/valrico/goodyear-bell-shoals-road.yml b/data/cities/valrico/goodyear-bell-shoals-road.yml
new file mode 100644
index 000000000..ae55b8a9d
--- /dev/null
+++ b/data/cities/valrico/goodyear-bell-shoals-road.yml
@@ -0,0 +1,11 @@
+id: 4593176545
+type: node
+latitude: 27.89014
+longitude: -82.26879
+postcode: "33596"
+city: Valrico
+street: Bell Shoals Road
+housenumber: "3523"
+phone: +1 (813) 651-9585
+opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00
+website: https://locations.thetirechoice.com/fl/valrico/3523-bell-shoals-road.html
diff --git a/data/cities/valrico/goodyear-fl-60.yml b/data/cities/valrico/goodyear-fl-60.yml
deleted file mode 100644
index 9bafb76cb..000000000
--- a/data/cities/valrico/goodyear-fl-60.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 4616561904
-type: node
-latitude: 27.93723
-longitude: -82.25935
-postcode: "33594"
-city: Valrico
-street: FL 60
-housenumber: "1701"
-phone: +1 (813) 661-3955
-opening_hours: Mo-Fr 07:30-18:00; Sa 08:00-12:00
-website: https://lovesautorepair.com/
diff --git a/data/cities/valrico/goodyear.yml b/data/cities/valrico/goodyear.yml
index ae55b8a9d..9bafb76cb 100644
--- a/data/cities/valrico/goodyear.yml
+++ b/data/cities/valrico/goodyear.yml
@@ -1,11 +1,11 @@
-id: 4593176545
+id: 4616561904
 type: node
-latitude: 27.89014
-longitude: -82.26879
-postcode: "33596"
+latitude: 27.93723
+longitude: -82.25935
+postcode: "33594"
 city: Valrico
-street: Bell Shoals Road
-housenumber: "3523"
-phone: +1 (813) 651-9585
-opening_hours: Mo-Fr 07:00-19:00; Sa 07:00-18:00
-website: https://locations.thetirechoice.com/fl/valrico/3523-bell-shoals-road.html
+street: FL 60
+housenumber: "1701"
+phone: +1 (813) 661-3955
+opening_hours: Mo-Fr 07:30-18:00; Sa 08:00-12:00
+website: https://lovesautorepair.com/
diff --git a/data/cities/zephyrhills/moramoto-of-zephyrhills.yml b/data/cities/zephyrhills/moramoto-of-zephyrhills.yml
index d2d3427f3..8e50f2bd0 100644
--- a/data/cities/zephyrhills/moramoto-of-zephyrhills.yml
+++ b/data/cities/zephyrhills/moramoto-of-zephyrhills.yml
@@ -7,6 +7,6 @@ city: Zephyrhills
 street: Gall Blvd
 housenumber: "8820"
 phone: 813-788-1779
-opening_hours: 'Tuesday - Friday : 9 AM–6 PM ||Saturday : 9 AM–5 PM ||Sunday – Monday
+opening_hours: 'Tuesday - Friday : 9 AM-6 PM ||Saturday : 9 AM-5 PM ||Sunday - Monday
     : Closed'
 website: https://www.moramoto.com/