diff --git a/navigator/iTop/Navigator.as b/navigator/iTop/Navigator.as
index 7b26b25c9..c7ce171c7 100644
--- a/navigator/iTop/Navigator.as
+++ b/navigator/iTop/Navigator.as
@@ -57,8 +57,8 @@
 			m_sDataUrl = ReadParam('xmlUrl', 'http://localhost:81/pages/xml.navigator.php?operation=relation');
 			m_sDetailsUrl = ReadParam('drillUrl', 'http://localhost/pages/UI.php?operation=details');
 			m_sRelation = ReadParam('relation', 'impacts');
-			m_sObjClass = ReadParam('obj_class', 'Server');
-			m_sObjId = ReadParam('obj_id', '1');
+			m_sObjClass = ReadParam('obj_class', 'DBServerInstance');
+			m_sObjId = ReadParam('obj_id', '7');
 			m_sStartPosition = ReadParam('start_pos', 'left');
 		}
 		
@@ -129,7 +129,7 @@
 				//trace("Data loaded." + myXML);
 				//trace("===========================");
 				parseXMLData(null, myXML, 0, 0);
-				m_sTitle.text = myXML.attribute("title");
+				m_sTitle.text = decodeEntities(myXML.attribute("title").toString());
 				m_oZoomSlider.enabled = true;
 				addEventListener(Event.ENTER_FRAME, drawLines);
 				m_oZoomSlider.value = 100;
@@ -195,12 +195,17 @@
 			}
 		}
 		
+		function decodeEntities(str: String)
+		{
+			return str.replace(/&amp;/g, '&').replace(/&gt;/g, '>').replace(/&lt;/g, '<').replace(/&quot;/g, '"').replace(/&apos;/g, "'");
+		}
+		
 		function addNode(oParent:GraphNode, oXMLData:XML, iChildIndex:Number, iChildCount:Number)
 		{
 			var sClass:String  = oXMLData.@obj_class;
 			var sClassName:String  = oXMLData.@obj_class_name;
 			var iId = oXMLData.@id;
-			var sLabel:String = oXMLData.@name;
+			var sLabel:String = decodeEntities(oXMLData.@name);
 			var sIcon:String = oXMLData.@icon;
 			var oDetails:Object = new Object;
 			var sZlist:String = oXMLData.@zlist;
diff --git a/navigator/iTop/ToolTip.as b/navigator/iTop/ToolTip.as
index 2a3fedcfe..37034b77d 100644
--- a/navigator/iTop/ToolTip.as
+++ b/navigator/iTop/ToolTip.as
@@ -57,6 +57,7 @@
 			graphics.drawRoundRect( 0, 0, _tf.textWidth+PADDING*4, _tf.textHeight+PADDING*4, ROUND );
 			graphics.endFill();
 			this.alpha = MIN_ALPHA;
+			this.visible = false;
 		}
 		// You have to call this after
 		// the tooltip has been added to the
@@ -118,6 +119,7 @@
 		
 		private function fadeIn( i:uint ):void
 		{
+			this.visible = true;
 			if (this.alpha < (1.0 - ALPHA_INC))
 			{
 				this.alpha += ALPHA_INC;
@@ -137,6 +139,7 @@
 			else
 			{
 				this.alpha = 0.0;
+				this.visible = false;
 			}
 			//trace("-- Tooltip alpha: "+this.alpha+" ALPHA_INC:"+ALPHA_INC);
 		}
diff --git a/navigator/navigator.fla b/navigator/navigator.fla
index 1cb158e50..d5f7ca346 100755
Binary files a/navigator/navigator.fla and b/navigator/navigator.fla differ
diff --git a/navigator/navigator.swf b/navigator/navigator.swf
index b2b9d68b9..feae28bda 100755
Binary files a/navigator/navigator.swf and b/navigator/navigator.swf differ