diff --git a/crouton.php b/crouton.php
index 1deaf22..ef89819 100644
--- a/crouton.php
+++ b/crouton.php
@@ -182,6 +182,9 @@ public function hasShortcode()
                     if (count($split) > 1) {
                         $this->hasMap = true;
                     }
+                    if ($_GET['meeting-id']) {
+                        $this->hasMap = true;
+                    }
                 }
                 if ($shortcode[2] === 'bmlt_handlebar') {
                     $this->hasMap = true;
@@ -403,7 +406,8 @@ private function getMapInitialization($mapConfig)
                         "crouton_map_create_control",
                         $externalMap,
                         isset($config['language']) ? substr($config['language'], 0, 2) : 'en',
-                        "croutonMap"
+                        "croutonMap",
+                        (empty($params['meeting_details_href'])) ? $_SERVER["REQUEST_URI"] : $params['meeting_details_href']
                     );
                 }
             }
diff --git a/croutonjs/src/js/crouton-map.js b/croutonjs/src/js/crouton-map.js
index 39fe7c6..162eeeb 100644
--- a/croutonjs/src/js/crouton-map.js
+++ b/croutonjs/src/js/crouton-map.js
@@ -279,6 +279,9 @@ CroutonMap.prototype.fillMap = function(filteredIds=null) {
 		infoWindow.setContent(marker.desc);
 		infoWindow.open(self.map, marker);
 	});
+	infoWindow.addListener('closeclick', function() {
+		jQuery(".bmlt-data-row > td").removeClass("rowHighlight");
+	});
 	// Add some markers to the map.
 	filteredMeetings.map(function (location, i) {
 		var marker_html = '<dl><dt><strong>';