diff --git a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl
index cd4ae2ec1..e5e18e32e 100644
--- a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl
@@ -40,7 +40,10 @@ function myClock(eh, ei, es, dh, di, ds, next, interval) {
 }
 
 function incClock() {
-    if (clock['remaining'].getTime() <= clock['interval']) stopClock();
+    if (clock['remaining'].getTime() <= clock['interval']*2)  {
+        stopClock();
+        exit();
+    }
 
     clock['elapsed'].setTime(clock['elapsed'].getTime() + clock['interval']);
     clock['remaining'].setTime(clock['duration'].getTime() - clock['elapsed'].getTime());
diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php
index cd66f7310..456d228a2 100644
--- a/livesupport/modules/htmlUI/var/ui_browser.class.php
+++ b/livesupport/modules/htmlUI/var/ui_browser.class.php
@@ -289,7 +289,9 @@ class uiBrowser extends uiBase {
         extract($param);
         static $records, $relations;
         $arr =& $records[$id];
-        if (is_array($arr))  return $arr;
+
+        if (is_array($arr))        return array('metadata' => $arr);
+
         if (!is_array($relations)) include dirname(__FILE__).'/formmask/mdata_relations.inc.php';
 
         $arr = $this->gb->getMDataArray($id, $this->sessid);