The OpenStreetMap wiki page for shop=e-cigarette says that "shop=e_cigarette" is a common tagging mistake for "shop=e-cigarette". When I checked against taginfo, it appeared there were 9 shops tagged as e_cigarette and 1181 tagged as e-cigarette. It seemed unnecessary to me to discuss changing these 9 with anybody, so I just got on with it.