amenity=fuel

Capitalizing brand (future will be regexp)
correcting order, cosmetic

correcting order and cosmetic cleanup