diff --git a/References/Jazz.md b/References/Jazz.md
index 158912b..30dbb7a 100644
--- a/References/Jazz.md
+++ b/References/Jazz.md
@@ -9,8 +9,8 @@ table without id
 	artist as Artist,
 	genre as Genre,
 	rating as Rating
-from #albums
 where
+	contains(category, [[Albums]]) and
 	contains(genre,this.file.link)
 sort rating desc
 ```
\ No newline at end of file
diff --git a/References/Kevin Kelly.md b/References/Kevin Kelly.md
index 98dd596..c2f259b 100644
--- a/References/Kevin Kelly.md	
+++ b/References/Kevin Kelly.md	
@@ -13,8 +13,8 @@ table without id
 	file.link as Title,
 	year as Year,
 	rating as Rating
-from #books
 where
+	contains(category,[[Books]]) and
 	contains(author,this.file.link)
 sort rating desc
 ```
@@ -25,8 +25,9 @@ sort rating desc
 table without id
 	file.link as Title,
 	published as Published
-from #clippings
-where author = this.file.link or contains(author,this.file.link)
+where
+	contains(category,[[Clippings]]) and
+	contains(author,this.file.link)
 sort rating desc
 ```
 
@@ -36,7 +37,8 @@ sort rating desc
 table without id
 	file.link as Podcast,
 	published as Published
-from #episodes
-where contains(guests,this.file.link)
+where
+	contains(category,[[Podcast episodes]]) and
+	contains(guests,this.file.link)
 sort rating desc
 ```
\ No newline at end of file
diff --git a/References/Steph Ango.md b/References/Steph Ango.md
index cfedee3..72f4431 100644
--- a/References/Steph Ango.md	
+++ b/References/Steph Ango.md	
@@ -14,8 +14,10 @@ url: https://stephango.com/
 
 ```dataview
 table without id
-	file.link as Title, published as Publish
-where author = this.file.link or contains(author,this.file.link)
+	file.link as Title,
+	published as Published
+where
+	contains(author,this.file.link)
 sort rating desc
 ```
 
@@ -23,8 +25,10 @@ sort rating desc
 
 ```dataview
 table without id
-	file.link as Meeting, date as Date
-where contains(people,this.file.link)
+	file.link as Meeting,
+	date as Date
+where
+	contains(people,this.file.link)
 sort file.name desc
 ```
 
diff --git a/Templates/Author Template.md b/Templates/Author Template.md
index d844d0c..32966a0 100644
--- a/Templates/Author Template.md	
+++ b/Templates/Author Template.md	
@@ -8,8 +8,11 @@ tags:
 
 ```dataview
 table without id
-	file.link as Title, year as Year, rating as Rating
-from #books
-where author = this.file.link or contains(author,this.file.link)
+	file.link as Title,
+	year as Year,
+	rating as Rating
+where
+	contains(category,[[Books]]) and
+	contains(author,this.file.link)
 sort rating desc
 ```
\ No newline at end of file
diff --git a/Templates/Backlinks Template.md b/Templates/Backlinks Template.md
index a0ff2f4..67425d8 100644
--- a/Templates/Backlinks Template.md	
+++ b/Templates/Backlinks Template.md	
@@ -1,6 +1,8 @@
 
 ```dataview
 list 
-where contains(type, this.file.link) and !contains(file.name, "Template")
+where
+	contains(type, this.file.link) and
+	!contains(file.name, "Template")
 sort file.ctime asc
 ```
\ No newline at end of file
diff --git a/Templates/City Template.md b/Templates/City Template.md
index 48d11db..d1df48f 100644
--- a/Templates/City Template.md	
+++ b/Templates/City Template.md	
@@ -14,9 +14,13 @@ last:
 ## Trips
 
 ```dataview
-table start as Start, end as End
-from #trips
-where contains(loc, this.file.link)
+table without id
+	file.link as Trip,
+	start as Start,
+	end as End
+where
+	contains(category, [[Trips]]) and
+	contains(location, this.file.link)
 sort file.name desc
 ```
 
@@ -33,8 +37,12 @@ coordinates: [[Madrid]]
 ```
 
 ```dataview
-table rating as Rating, type as "Type"
-from #places
-where contains(loc, this.file.link)
+table without id
+	file.link as City,
+	rating as Rating,
+	type as Type
+where
+	contains(category, [[Places]]) and
+	contains(location, this.file.link)
 sort rating desc
 ```
\ No newline at end of file
diff --git a/Templates/Game Studio Template.md b/Templates/Game Studio Template.md
index 6f51cb7..0f03714 100644
--- a/Templates/Game Studio Template.md	
+++ b/Templates/Game Studio Template.md	
@@ -7,8 +7,12 @@ tags:
 ## Games
 
 ```dataview
-table year as Year, rating as Rating
-from #games
-where maker = this.file.link or contains(maker,this.file.link)
+table without id
+	file.link as Game,
+	year as Year,
+	rating as Rating
+where
+	contains(category,[[Games]]) and
+	contains(maker,this.file.link)
 sort year desc
 ```
\ No newline at end of file
diff --git a/Templates/Genre Template.md b/Templates/Genre Template.md
index c987249..f0ecacc 100644
--- a/Templates/Genre Template.md	
+++ b/Templates/Genre Template.md	
@@ -5,7 +5,7 @@ tags:
 ```dataview
 table without id
 	file.link as Title,
-	rating as "Rating"
+	rating as Rating
 where
 	contains(genre,this.file.link)
 sort rating desc
diff --git a/Templates/Meeting Type Template.md b/Templates/Meeting Type Template.md
index f8c352d..c62428b 100644
--- a/Templates/Meeting Type Template.md	
+++ b/Templates/Meeting Type Template.md	
@@ -6,9 +6,13 @@ tags:
 
 ```dataview
 table without id
-	file.link as Meeting, people as People, date as Date
-from #meetings or #dates
-where !contains(file.name,"Template") and contains(type,this.file.link)
+	file.link as Meeting,
+	people as People,
+	date as Date
+where
+	contains(category, [[Meetings]]) and
+	!contains(file.name,"Template") and 
+	contains(type,this.file.link)
 sort date desc
 limit 50
 ```
\ No newline at end of file
diff --git a/Templates/People Type Template.md b/Templates/People Type Template.md
index e4b5e20..47bb906 100644
--- a/Templates/People Type Template.md	
+++ b/Templates/People Type Template.md	
@@ -5,8 +5,8 @@ tags:
 ```dataview
 table without id
 	file.link as Name
-from #people
 where
+	contains(category, [[People]]) and
 	!contains(file.name,"Template")
 sort file.name asc
 ```
\ No newline at end of file
diff --git a/Templates/Place Type Template.md b/Templates/Place Type Template.md
index ccd05f4..099df9b 100644
--- a/Templates/Place Type Template.md	
+++ b/Templates/Place Type Template.md	
@@ -17,7 +17,7 @@ table without id
 	file.link as Place,
 	rating as Rating,
 	location as Location
-from #places
 where
+	contains(category, [[Places]]) and
 	contains(type, this.file.link)
 ```
\ No newline at end of file
diff --git a/Templates/Product Type Template.md b/Templates/Product Type Template.md
index 497f4da..b121c47 100644
--- a/Templates/Product Type Template.md	
+++ b/Templates/Product Type Template.md	
@@ -4,8 +4,16 @@ tags:
 ---
 ```dataview
 table without id
-	file.link as Item, maker as "Maker", price as "Price", rating as Rating, purchased as Purchased
-from #products
-where type = this.file.link or contains(type,this.file.link)
-sort purchased desc, rating desc, file.mtime desc
+	file.link as Item,
+	maker as Maker,
+	price as Price,
+	rating as Rating,
+	purchased as Purchased
+where
+	contains(category, [[Products]]) and
+	contains(type,this.file.link)
+sort
+	purchased desc,
+	rating desc,
+	file.mtime desc
 ```
\ No newline at end of file
diff --git a/Templates/Recent Entries Template.md b/Templates/Recent Entries Template.md
index 71b8edf..528f468 100644
--- a/Templates/Recent Entries Template.md	
+++ b/Templates/Recent Entries Template.md	
@@ -1,8 +1,10 @@
 # Recent entries
 
 ```dataview
-table created as Date
-where contains(file.outlinks, this.file.link)
+table
+	created as Date
+where
+	contains(file.outlinks, this.file.link)
 sort created desc
 limit 20
 ```
\ No newline at end of file
diff --git a/Templates/Video Game Genre Template.md b/Templates/Video Game Genre Template.md
index 2d73477..aa07c9c 100644
--- a/Templates/Video Game Genre Template.md	
+++ b/Templates/Video Game Genre Template.md	
@@ -3,8 +3,14 @@ tags:
   - games/genres
 ---
 ```dataview
-table maker as "Maker", year as Year, rating as Rating
-from #games
-where !contains(file.name, "Template") and contains(genre, this.file.link)
+table without id
+	file.link as Game,
+	maker as Maker,
+	year as Year,
+	rating as Rating
+where
+	contains(categoy, [[Games]]) and
+	!contains(file.name, "Template") and
+	contains(genre, this.file.link)
 sort rating desc
 ```
\ No newline at end of file