diff --git a/indexer.py b/indexer.py
index 99872ca..d59554f 100755
--- a/indexer.py
+++ b/indexer.py
@@ -23,6 +23,7 @@ import sys
 import time
 import base64
 import hashlib
+import urllib.parse
 
 import config
 import thumb
@@ -89,7 +90,7 @@ class Node:
         self.date = os.path.getmtime(src)
         self.mangle = config.mangle + mangle(self.path) + '.' + self.ext
         self.hide = hide or (parent and parent.hide)
-        self.url = join(config.url, self.path)
+        self.url = join((parent.url if self.parent else config.url), urllib.parse.quote(self.name))
         self.mangleurl = join(config.url, self.mangle)
         self.hideurl = join(config.hideurl, self.path) if self.isdir else (self.mangleurl if self.hide else self.url)
         self.thumburl = None
@@ -147,13 +148,13 @@ class Node:
         ts = None
         td = None
         dst = config.hidedst if self.hide else config.dst
-        url = config.hideurl if self.hide else config.url
+        url = self.hideurl if self.hide else self.url
         if self.isdir:
             dst = join(dst, self.path, '.thumb.')
-            url = join(url, self.path, '.thumb.')
+            url = join(url, '.thumb.')
         else:
             dst = join(dst, self.path + '.thumb.')
-            url = join(url, self.path + '.thumb.')
+            url += '.thumb.'
 
         for e in reversed(thumbext):
             if isfile(join(self.src, '.thumb.' + e)): ts = join(self.src, '.thumb.' + e)