diff --git a/Models/UrlTrackerDomain.cs b/Models/UrlTrackerDomain.cs
index 79b2e1f..6ec5248 100644
--- a/Models/UrlTrackerDomain.cs
+++ b/Models/UrlTrackerDomain.cs
@@ -13,7 +13,17 @@ public class UrlTrackerDomain
         public int NodeId { get; set; }
         public string Name { get; set; }
 
-        public Node Node { get { return new Node(NodeId); } }
+        private Node _node = null;
+        public Node Node
+        {
+            get
+            {
+                if (_node == null)
+                    _node = new Node(NodeId);
+                return _node;
+            }
+        }
+
         public string UrlWithDomain
         {
             get
diff --git a/Modules/UrlTrackerModule.cs b/Modules/UrlTrackerModule.cs
index d636c37..b27bd73 100644
--- a/Modules/UrlTrackerModule.cs
+++ b/Modules/UrlTrackerModule.cs
@@ -139,7 +139,7 @@ static void UrlTrackerDo(string callingEventName, bool ignoreHttpStatusCode = fa
                     string fullRawUrl;
                     string previousFullRawUrlTest;
                     string fullRawUrlTest;
-                    fullRawUrl = previousFullRawUrlTest = fullRawUrlTest = string.Format("{0}{1}{2}{3}", request.Url.Scheme, Uri.SchemeDelimiter, request.Url.Host, request.RawUrl);
+                    fullRawUrl = previousFullRawUrlTest = fullRawUrlTest = string.Format("{0}{1}{2}{3}", request.Url.Scheme, Uri.SchemeDelimiter, request.Url.Host, request.Url.AbsolutePath);
 
                     UrlTrackerDomain urlTrackerDomain;
                     do