diff --git a/client/js/GoogleMapField.js b/client/js/GoogleMapField.js
index f99992a..84bd56c 100644
--- a/client/js/GoogleMapField.js
+++ b/client/js/GoogleMapField.js
@@ -232,7 +232,7 @@ window.googlemapfieldInit = function () {
     };
 
     function init() {
-        var mapFields = $(".googlemapfield:visible").gmapfield();
+        var mapFields = $(".googlemapfield").gmapfield();
 
         mapFields.each(initField);
     }
diff --git a/src/GoogleMapField.php b/src/GoogleMapField.php
index f385e57..19c5c80 100644
--- a/src/GoogleMapField.php
+++ b/src/GoogleMapField.php
@@ -79,6 +79,8 @@ public function __construct($name, $title = null, $value = null, $data = [],  $o
             $this->defaultValues = $data;
         }
 
+        $this->addExtraClass('googlemapfield');
+
         $this->setupChildren();
 
     }
@@ -100,9 +102,9 @@ public function hasData()
 
     public function setValue($value, $data = null)
     {
-        if ($data) {
-            $this->setDataRecord($data);
-        } else if (!$this->children->count()) {
+        $this->setDataRecord($value);
+
+        if (!$this->children->count()) {
             $this->setupChildren();
         }
 
diff --git a/templates/BetterBrief/GoogleMapField_holder.ss b/templates/BetterBrief/GoogleMapField_holder.ss
index df878d9..f746802 100644
--- a/templates/BetterBrief/GoogleMapField_holder.ss
+++ b/templates/BetterBrief/GoogleMapField_holder.ss
@@ -1,4 +1,4 @@
-<div id="$HolderID" class="field<% if $extraClass %> $extraClass<% end_if %>">
+<div id="$HolderID" class="field">
 	<% if $Title %><label class="left" for="$ID">$Title</label><% end_if %>
 	<div class="middleColumn">
 		$Field