diff --git a/templates/base.html b/templates/base.html
index 5125e07..fe58ebc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -45,10 +45,11 @@
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
 {% if user.is_authenticated %}
-            <li{% if request.resolver_match.url_name == 'index' %} class="active"{%endif%}><a href="{% url "dashboard" %}">Dashboard</a></li>
+            <li{% if request.resolver_match.url_name == 'dashboard' %} class="active"{%endif%}><a href="{% url "dashboard" %}">Dashboard</a></li>
 {% else %}
             <li{% if request.resolver_match.url_name == 'index' %} class="active"{%endif%}><a href="{% url "index" %}">Home</a></li>
 {% endif %}
+            <li{% if "dncore" in request.resolver_match.app and request.resolver_match.url_name == 'search' %} class="active"{%endif%}><a href="{% url "whoisdb:search" %}">Search</a></li>
 			<li class="dropdown{% if request.resolver_match.url_name == 'whoisdb' %} active{%endif%}">
 				<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Whois DB <span class="caret"></span></a>
 				<ul class="dropdown-menu">
diff --git a/whoisdb/helpers.py b/whoisdb/helpers.py
index b0712c2..c25df5d 100644
--- a/whoisdb/helpers.py
+++ b/whoisdb/helpers.py
@@ -108,12 +108,9 @@ def findInDatabase(rawValue):
 		whoisdb.models.ASNumber,
 	]
 	for handleObj in handleObjs:
-		results.extend(handleObj.objects.filter(handle=rawValue))
+		obj = handleObj.objects.filter(handle=rawValue)
+		if not obj and len(rawValue) >= 3:
+			obj = handleObj.objects.filter(handle__startswith=rawValue)
+		results.extend(obj)
 
 	return results
-
-	# try:
-	#	- ipnetwork
-	#	- ipaddress
-	#	- asnumber (either asXXXXXX or just number XXXXXX)
-	#	- handle name
diff --git a/whoisdb/models.py b/whoisdb/models.py
index f97438f..14277cd 100644
--- a/whoisdb/models.py
+++ b/whoisdb/models.py
@@ -116,6 +116,9 @@ class MntdObject(WhoisObject):
 	mnt_by = models.ManyToManyField(Maintainer)
 
 	def canEdit(self, user):
+		if not hasattr(user, "maintainer_set"):
+			return False
+
 		mnts = user.maintainer_set.all()
 		objmnts = self.mnt_by.all()
 		if hasattr(self, "mnt_lower"):