diff --git a/Edikoyo/Animals/_index.md b/Edikoyo/Animals/_index.md
index b08afd0..74e745c 100644
--- a/Edikoyo/Animals/_index.md
+++ b/Edikoyo/Animals/_index.md
@@ -1,5 +1,6 @@
 ```dataview
-TABLE choice(file.name != "_index", file.name, file.folder[-1]) as "Name"
+TABLE WITHOUT ID link(file.path, choice(file.name != "_index", file.name, split(file.folder, "/")[1])) as "Animals"
 FROM "Animals"
+WHERE file.folder = "Animals" or file.name = "_index"
 ```
 <!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Animals" SORT file.name -->
\ No newline at end of file
diff --git a/content/docs/Animals/_index.md b/content/docs/Animals/_index.md
index ba1d434..530d964 100644
--- a/content/docs/Animals/_index.md
+++ b/content/docs/Animals/_index.md
@@ -3,8 +3,9 @@
 
 
 ````dataview
-TABLE choice(file.name != "_index", file.name, file.folder[-1]) as "Name"
+TABLE WITHOUT ID link(file.path, choice(file.name != "_index", file.name, split(file.folder, "/")[1])) as "Animals"
 FROM "Animals"
+WHERE file.folder = "Animals" or file.name = "_index"
 ````
 
 <!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Animals" SORT file.name -->