childcare amenity

Added childcare amenity tag. Removed conflicting terms in kindergarten tag.