resolved in https://www.openstreetmap.org/changeset/165871701 apart for the discussion about shop=trade here: https://community.openstreetmap.org/t/unusual-and-not-documented-shop-values-in-usa/106299