Replace various Leaflet extensions with new builtin methods
Use new Leaflet setPopupContent method