Consistency: shops <-> bars, etc

Avoid clittering the first zoom level that shows shop icons with the corresponding names
(Makes it consistent with amenities like bars, pubs, restaurants)