diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index aabcae45f..7dbaa4e3e 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -343,6 +343,10 @@ trait ParsedownGravTrait
                 $url['path'] = Uri::convertUrl($this->page, $url['path'], $type, true);
             }
 
+            // URL path already has these now so remove them
+            unset($url['query']);
+            unset($url['fragment']);
+
             // if absolute urls enabled, add them
             if (self::getGrav()['config']->get('system.absolute_urls', false)) {
                 $uri = self::getGrav()['uri'];
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/01.item1-1-1/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/01.item1-1-1/default.md
new file mode 100644
index 000000000..14ad70cb4
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/01.item1-1-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/02.item1-1-2/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/02.item1-1-2/default.md
new file mode 100644
index 000000000..2d25766c7
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/02.item1-1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/03.item1-1-3/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/03.item1-1-3/default.md
new file mode 100644
index 000000000..42f000902
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/03.item1-1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/default.md
new file mode 100644
index 000000000..da8052859
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/01.item1-2-1/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/01.item1-2-1/default.md
new file mode 100644
index 000000000..b07967d1e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/01.item1-2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/02.item1-2-2/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/02.item1-2-2/default.md
new file mode 100644
index 000000000..ba0603668
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/02.item1-2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/03.item1-2-3/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/03.item1-2-3/default.md
new file mode 100644
index 000000000..514de19b9
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/03.item1-2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/default.md
new file mode 100644
index 000000000..6f2853032
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/01.item1-3-1/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/01.item1-3-1/default.md
new file mode 100644
index 000000000..c2af57160
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/01.item1-3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/02.item1-3-2/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/02.item1-3-2/default.md
new file mode 100644
index 000000000..9e0d64cea
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/02.item1-3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/03.item1-3-3/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/03.item1-3-3/default.md
new file mode 100644
index 000000000..d961ff75d
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/03.item1-3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/default.md
new file mode 100644
index 000000000..b214efa9a
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/default.md b/tests/fake/nested-site/user/pages/01.item1/default.md
new file mode 100644
index 000000000..1019157fe
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/01.item2-1-1/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/01.item2-1-1/default.md
new file mode 100644
index 000000000..11f47bf1e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/01.item2-1-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/02.item2-1-2/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/02.item2-1-2/default.md
new file mode 100644
index 000000000..3154d3d8a
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/02.item2-1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/03.item2-1-3/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/03.item2-1-3/default.md
new file mode 100644
index 000000000..553db89cd
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/03.item2-1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/default.md
new file mode 100644
index 000000000..6e4261d0c
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/01.item2-2-1/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/01.item2-2-1/default.md
new file mode 100644
index 000000000..7798f0955
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/01.item2-2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/02.item2-2-2/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/02.item2-2-2/default.md
new file mode 100644
index 000000000..3d3555010
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/02.item2-2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/03.item2-2-3/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/03.item2-2-3/default.md
new file mode 100644
index 000000000..f4bb37c0e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/03.item2-2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/default.md
new file mode 100644
index 000000000..65966c378
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/01.item2-3-1/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/01.item2-3-1/default.md
new file mode 100644
index 000000000..5d17e1df9
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/01.item2-3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/02.item2-3-2/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/02.item2-3-2/default.md
new file mode 100644
index 000000000..2a2c6f6ac
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/02.item2-3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/03.item2-3-3/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/03.item2-3-3/default.md
new file mode 100644
index 000000000..064933976
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/03.item2-3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/default.md
new file mode 100644
index 000000000..41b4acb08
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/default.md b/tests/fake/nested-site/user/pages/02.item2/default.md
new file mode 100644
index 000000000..3a27233d2
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/01.item3-1-1/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/01.item3-1-1/default.md
new file mode 100644
index 000000000..ee0120db6
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/01.item3-1-1/default.md
@@ -0,0 +1,14 @@
+---
+title: Animal
+taxonomy:
+    tag: [animal, cat]
+---
+
+<h1>Tags: animal</h1
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/02.item3-1-2/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/02.item3-1-2/default.md
new file mode 100644
index 000000000..6308fc58e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/02.item3-1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/03.item3-1-3/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/03.item3-1-3/default.md
new file mode 100644
index 000000000..f18a80a9f
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/03.item3-1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/default.md
new file mode 100644
index 000000000..6e4261d0c
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/01.item3-2-1/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/01.item3-2-1/default.md
new file mode 100644
index 000000000..d23767d32
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/01.item3-2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/02.item3-2-2/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/02.item3-2-2/default.md
new file mode 100644
index 000000000..669f15f90
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/02.item3-2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/03.item3-2-3/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/03.item3-2-3/default.md
new file mode 100644
index 000000000..5a88e78f0
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/03.item3-2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/default.md
new file mode 100644
index 000000000..6e4261d0c
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/01.item3-3-1/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/01.item3-3-1/default.md
new file mode 100644
index 000000000..ce2ae8c3b
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/01.item3-3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-3-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/02.item3-3-2/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/02.item3-3-2/default.md
new file mode 100644
index 000000000..f42aa0fa2
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/02.item3-3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-3-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/03.item3-3-3/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/03.item3-3-3/default.md
new file mode 100644
index 000000000..af4a04961
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/03.item3-3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-3-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/default.md
new file mode 100644
index 000000000..3a27233d2
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/default.md b/tests/fake/nested-site/user/pages/03.item3/default.md
new file mode 100644
index 000000000..ee7ba9477
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index ba8890aa6..d295a9899 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -2,6 +2,10 @@
 
 use Codeception\Util\Fixtures;
 use Grav\Common\Grav;
+use Grav\Common\Page\Pages;
+use Grav\Common\Page\Page;
+use Grav\Common\Markdown\Parsedown;
+
 
 /**
  * Class AssetsTest
@@ -14,10 +18,24 @@ class MarkdownTest extends \Codeception\TestCase\Test
     /** @var Grav $grav */
     protected $grav;
 
+    /** @var Pages $pages */
+    protected $pages;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
 
+        $this->pages = $this->grav['pages'];
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
+        $this->pages->init();
+
+        unset($this->grav['pages']);
+
+        $this->grav['pages'] = $this->pages;
+
         $defaults = [
             'extra'            => false,
             'auto_line_breaks' => false,
@@ -25,7 +43,7 @@ class MarkdownTest extends \Codeception\TestCase\Test
             'escape_markup'    => false,
             'special_chars'    => ['>' => 'gt', '<' => 'lt'],
         ];
-        $page = new \Grav\Common\Page\Page();
+        $page = $this->pages->dispatch('/item2/item2-2');
 
         $this->parsedown = new Parsedown($page, $defaults);
     }
@@ -44,6 +62,26 @@ class MarkdownTest extends \Codeception\TestCase\Test
         return preg_replace('/^\s*(.*)/', '', $string);
     }
 
+    public function testDirectoryRelativeLinks()
+    {
+        $this->assertSame($this->parsedown->text('[Down a Level](item2-2-1)'),
+            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
+        $this->assertSame($this->parsedown->text('[Up a Level](..)'),
+            '<p><a href="/item2">Up a Level</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down](../../item3/item3-3)'),
+            '<p><a href="/item3/item3-3">Up and Down</a></p>');
+        $this->assertSame($this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'),
+            '<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>');
+//        $this->assertSame($this->parsedown->text('[Up a Level with Query](../?foo=bar)'),
+//            '<p><a href="/item2?foo=bar">Up a Level with Query</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'),
+        '<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'),
+            '<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'),
+            '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
+    }
+
     public function testMarkdownSpecialProtocols()
     {
         $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),
@@ -59,13 +97,13 @@ class MarkdownTest extends \Codeception\TestCase\Test
     public function testMarkdownReferenceLinks()
     {
         $sample = '[relative link][r_relative]
-                   [r_relative]: ../03.assets#blah';
-        $this->assertSame($this->parsedown->text($sample), '<p><a href="../03.assets#blah">relative link</a></p>');
+                   [r_relative]: ../item2-3#blah';
+        $this->assertSame($this->parsedown->text($sample), '<p><a href="/item2/item2-3#blah">relative link</a></p>');
 
         $sample = '[absolute link][r_absolute]
-                   [r_absolute]: /blog/focus-and-blur#blah';
+                   [r_absolute]: /item3#blah';
         $this->assertSame($this->parsedown->text($sample),
-            '<p><a href="/blog/focus-and-blur#blah">absolute link</a></p>');
+            '<p><a href="/item3#blah">absolute link</a></p>');
 
         $sample = '[external link][r_external]
                    [r_external]: http://www.cnn.com';