diff --git a/google-map-marker.html b/google-map-marker.html
index e28503e..747780b 100644
--- a/google-map-marker.html
+++ b/google-map-marker.html
@@ -394,7 +394,8 @@
           this._contentObserver = new MutationObserver( this._contentChanged.bind(this));
           this._contentObserver.observe( this, {
             childList: true,
-            subtree: true
+            subtree: true,
+            characterData: true
           });
 
           var content = this.innerHTML.trim();
diff --git a/google-map.html b/google-map.html
index 4fbb6a9..8d2af0f 100644
--- a/google-map.html
+++ b/google-map.html
@@ -457,7 +457,7 @@
 
       detached: function() {
         if (this._markersChildrenListener) {
-          this.unlisten(this.$.selector, 'items-changed', '_updateMarkers');
+          this.unlisten(this.$.selector, 'iron-items-changed', '_updateMarkers');
           this._markersChildrenListener = null;
         }
         if (this._objectsMutationObserver) {
@@ -531,7 +531,7 @@
         if (this._markersChildrenListener) {
           return;
         }
-        this._markersChildrenListener = this.listen(this.$.selector, 'items-changed', '_updateMarkers');
+        this._markersChildrenListener = this.listen(this.$.selector, 'iron-items-changed', '_updateMarkers');
       },
 
       _updateMarkers: function() {