diff --git a/src/Snap/StaticPages/Internal/Handlers.hs b/src/Snap/StaticPages/Internal/Handlers.hs
index 2c070d1..ce576d0 100644
--- a/src/Snap/StaticPages/Internal/Handlers.hs
+++ b/src/Snap/StaticPages/Internal/Handlers.hs
@@ -221,10 +221,6 @@ serveIndex soFar content = do
     let recent    =  take 5 rchron
 
     let runPosts = loopThru st
---    let splices1 = [ ("posts:alphabetical"        , runPosts alpha)
---                   , ("posts:chronological"       , runPosts chron)
---                   , ("posts:reverseChronological", runPosts rchron)
---                   , ("posts:recent"              , runPosts recent) ]
     let splices1 = do
         "posts:alphabetical"         ## runPosts alpha
         "posts:chronological"        ## runPosts chron
diff --git a/src/Snap/StaticPages/Internal/Post.hs b/src/Snap/StaticPages/Internal/Post.hs
index 5b49a87..b98e1dc 100644
--- a/src/Snap/StaticPages/Internal/Post.hs
+++ b/src/Snap/StaticPages/Internal/Post.hs
@@ -308,7 +308,9 @@ buildContentMap baseURL basedir = build [] "."
             if ".md" `isSuffixOf` f then do
                 -- it's a post
                 let baseName = dropExtension f
-                let pId = concat [baseURL, "/", pathSoFar, "/", baseName]
+                let pId = if null pathSoFar
+                            then concat [baseURL, "/", baseName]
+                            else concat [baseURL, "/", pathSoFar, "/", baseName]
                 !p <- readPost pId fp
                 return $! Map.insert (B.pack baseName) (ContentPost p) mp
               else