diff --git a/README.md b/README.md
index 2b8c2e7..df1478f 100644
--- a/README.md
+++ b/README.md
@@ -22,31 +22,6 @@ python wiki_relations.py
 
 _Ask_ SMW with the following query:
 
-```
-[[Category:Deployments||Institution]]  OR [[Category:Technologies]] [[Developed by (institutions)::+]] OR [[Category:Technologies]]  [[-Software Deployed::+]] OR [[Category:City]]
-```
-
-```
-?Category
-?Geolocation
-?City
-?City.Has Coordinates=City Coordinates
-?City.Is in Country=City Country
-?City.Is in Country.Has Coordinates=Country Coordinates
-?Clients
-?Managed by
-?Used by
-?Funded by
-?Provided by
-?Software Deployed
-?Software Deployed.Developped by (institutions)=Software Developer
-?Datasets Used
-?Datasets Used.Developed by Institution=Dataset Developer
-```
-
-----
-
-
 ```
 ({{#ask: [[Category:Deployments||Institution]]  
 OR [[Category:Technologies]] [[Developed by (institutions)::+]]  // TODO: + should give a subquery <q></q> with all institutions in EU
@@ -75,16 +50,16 @@ OR [[Category:Technologies]]  [[-Software Deployed::+]] // TODO: + should give a
  |class=sortable wikitable smwtable
 }}
 
+TODO: see: https://www.semantic-mediawiki.org/wiki/Help:Querying_for_the_absence_of_a_property
 
-{{#ask: [[Category:Deployments||Institution]]  [[Not in graph::!Greens Report 2021]]
-OR [[Category:Technologies]] [[Developed by (institutions)::+]]
-OR [[Category:Technologies]]  [[-Software Deployed::+]]
+{{#ask: [[Category:Deployments||Institution]]  [[Is in Greens Report 2021::True]]
  |?Category
  |?Geolocation
  |?City
  |?City.Has Coordinates=City Coordinates
  |?City.Is in Country=City Country
  |?City Country.Has Coordinates=Country Coordinates
+ |?Institution Type
  |?Clients
  |?Managed by
  |?Used by
@@ -94,6 +69,8 @@ OR [[Category:Technologies]]  [[-Software Deployed::+]]
  |?Software Deployed.Developped by (institutions)=Software Developer
  |?Datasets Used
  |?Datasets Used.Developed by Institution=Dataset Developer
+ |?Related Institutions
+ |?Involved Entities
  |format=broadtable
  |limit=50
  |offset=0
diff --git a/www/story.html b/www/story.html
index 775b498..2246e8f 100644
--- a/www/story.html
+++ b/www/story.html
@@ -150,7 +150,7 @@
                 Quisque vulputate odio neque, eget laoreet felis molestie sit amet.
             </p>
         </div>
-        <div class='section' data-title="Data-lab Burglary-free Neighbourhood">
+        <div class='section' data-title="Burglary-Free Neighbourhood">
             <h2>Burglary-free Neighbourhood</h2>
             <p>
                 Aenean fringilla nisl sed ante congue, in commodo tellus ullamcorper. Nullam sollicitudin, lacus id