Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10363)
+++ /tools/gformat.py	(revision 10364)
@@ -106,5 +106,5 @@
   proxylist = sorted([os.path.basename(x) for x in glob.glob("%s/proxy*" % NODE_DIR)],
                 key=lambda name: int(''.join([c for c in name if c in string.digits])),
-                cmp=lambda x,y: x - y)
+                cmp=lambda x,y: x - y) + sorted([os.path.basename(x) for x in glob.glob("%s/Proxy*" % NODE_DIR)])
   return proxylist
 
@@ -966,5 +966,5 @@
             return False
 
-          self.cgi_info = (__file__, self.path)
+          self.cgi_info = (os.path.basename(__file__), self.path)
           self.path = ''
           return True