diff --git a/pages/index.md b/pages/index.md
index 5fedf2c..b543ec2 100644
--- a/pages/index.md
+++ b/pages/index.md
@@ -10,3 +10,5 @@ timestamp: null
 # Well hello there
 
 This site is empty, you can start populating it!
+
+[link test](/?link-test)
diff --git a/reploy.hs b/reploy.hs
index aab4282..b94046d 100644
--- a/reploy.hs
+++ b/reploy.hs
@@ -181,7 +181,8 @@ processLink base l =
        || take 1 l == "#"
     then pure l
     else if isAbsolute l
-           then rootedPageLink l
+           then let (path, rest) = break (`elem` ['?', '#']) l
+                 in (<> rest) <$> rootedPageLink path
            else installFile (base </> l) >>= rootedLink
 
 -- | Conjure a function that finds a displayable name for a page at a particular mount.
@@ -208,6 +209,8 @@ addGlobalMeta meta = do
   rt <- rootedLink'
   rtp <- rootedPageLink'
   pn <- pageName'
+  aui <- use appendUrlIndex
+  ifi <- use indexFile
   Y.Object m <- (`objMerge` meta) <$> use extraMeta
   let l = map (\(k, v) -> (K.toText k, Mu.toMustache v)) $ KM.toList m
   pure . Mu.object
@@ -217,6 +220,9 @@ addGlobalMeta meta = do
            , ("pageLink", Mu.overText $ T.pack . rtp . T.unpack)
            , ("pageName", Mu.overText $ T.pack . pn . T.unpack)
            ]
+        ++ (if aui
+              then [("indexFile", Mu.toMustache $ T.pack ifi)]
+              else [])
 
 -- | Get the expected timestamp file for a given filepath
 metadataFile :: FilePath -> Site FilePath