diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 303ce643c4..79929bd175 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -560,12 +560,11 @@ namespace OpenSim.Framework.Servers
             foreach (string pattern in m_llsdHandlers.Keys)
             {
                 
-                if (pattern.StartsWith(searchquery) && searchquery.Length >= pattern.Length)
+                if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length)
                 {
-                    if (String.IsNullOrEmpty(bestMatch) || searchquery.Length > bestMatch.Length)
-                    {
+                    
                         bestMatch = pattern;
-                    }
+                   
                 }
             }