diff --git a/python/deskbar-handler/tracker-handler.py b/python/deskbar-handler/tracker-handler.py
index 2a5a8b9..34493fa 100644
--- a/python/deskbar-handler/tracker-handler.py
+++ b/python/deskbar-handler/tracker-handler.py
@@ -277,7 +277,7 @@ class TrackerLiveSearchHandler(SignallingHandler):
 				output["title"] = cgi.escape(info[3])
 				output["publisher"] = cgi.escape(info[4])
 
-			if output['type'] == "GaimConversations":
+			elif output['type'] == "GaimConversations":
 				uri = output['uri']
 				m = self.conv_re.match (uri)
 				output['channel']=_("with")
@@ -295,6 +295,9 @@ class TrackerLiveSearchHandler(SignallingHandler):
 					if len (nick_server) > 1:
 						output['conv_to'] = "%s on %s" % (output['conv_to'], nick_server[1])
 				output['uri'] = output['uri'].replace ("%", "%25") # escape the escapes
+
+			elif output['type'] == 'Applications':
+				output['uri'] = output['uri'].replace ("%U", "").replace ("%u", "")
 	
 		for key in self.results.keys():
 				for res in self.results[key][0:MAX_RESULTS]:
@@ -309,7 +312,7 @@ class TrackerLiveSearchHandler(SignallingHandler):
 				
 	def query (self, qstring, max):
 		if qstring.count("tag:") == 0: 
-			for service in ("Conversations", "Applications", "Files", "Emails"):
+			for service in ("Files", "Emails", "Conversations", "Applications"):
 				self.search_iface.TextDetailed (-1, service, qstring, 0,10, reply_handler=lambda hits : self.recieve_hits(qstring, hits, max), error_handler=self.recieve_error)
 			print "Tracker query:", qstring
 		else: