diff --git a/.htaccess b/.htaccess
index fe38149..1e71549 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,12 +4,11 @@ RewriteRule "^2018/data-flaneur$" "index.html"
 RewriteRule "^2018/digital-cultures$" "index.html"
 RewriteRule "^article/choose-how-you-feel-you-have-seven-options$" "index.html"
 RewriteRule "^assets/video/guerilla_project.mp4$" "index.html"
-RewriteRule "^assets/video/samawati.mp4$" "index.html"
-RewriteRule "^diede$" "index.html"
-RewriteRule "^diede/image/1$" "index.html"
-RewriteRule "^diede/image/2$" "index.html"
 RewriteRule "^emotionhero$" "index.html"
 RewriteRule "^event/cqrrelations$" "index.html"
+RewriteRule "^exercises-in-overfitting$" "index.html"
+RewriteRule "^exercises-in-overfitting/image/1$" "index.html"
+RewriteRule "^exercises-in-overfitting/image/2$" "index.html"
 RewriteRule "^exhibition/codesandmodes$" "index.html"
 RewriteRule "^exhibition/hello-world$" "index.html"
 RewriteRule "^exhibition/kickstart$" "index.html"
@@ -21,7 +20,6 @@ RewriteRule "^ghost-worker$" "index.html"
 RewriteRule "^ghost-worker/image/1$" "index.html"
 RewriteRule "^ghost-worker/image/2$" "index.html"
 RewriteRule "^ghost-worker/image/3$" "index.html"
-RewriteRule "^ghost-worker/image/4$" "index.html"
 RewriteRule "^ghost-worker/video/1$" "index.html"
 RewriteRule "^in4art-salon$" "index.html"
 RewriteRule "^mvp1$" "index.html"
@@ -36,6 +34,8 @@ RewriteRule "^mvp3$" "index.html"
 RewriteRule "^mvp3/image/1$" "index.html"
 RewriteRule "^mvps$" "index.html"
 RewriteRule "^organisation/constant$" "index.html"
+RewriteRule "^organisation/nsvp$" "index.html"
+RewriteRule "^organisation/setup$" "index.html"
 RewriteRule "^organisation/v2_$" "index.html"
 RewriteRule "^person/cristina-cochior$" "index.html"
 RewriteRule "^person/donald-schenkel$" "index.html"
@@ -48,23 +48,24 @@ RewriteRule "^place/q21$" "index.html"
 RewriteRule "^plottingdata$" "index.html"
 RewriteRule "^residency/q21$" "index.html"
 RewriteRule "^residency/summer-sessions$" "index.html"
+RewriteRule "^samawati/video$" "index.html"
 RewriteRule "^spectacular-spectator-mood-meter$" "index.html"
 RewriteRule "^sustaining-gazes$" "index.html"
 RewriteRule "^sustaining-gazes/image/1$" "index.html"
 RewriteRule "^sustaining-gazes/image/2$" "index.html"
 RewriteRule "^venue/cruise-terminal$" "index.html"
 RewriteRule "^venue/zoho$" "index.html"
-RewriteRule "@type/Event" "index.html"
-RewriteRule "@type/Report" "index.html"
-RewriteRule "@type/VideoObject" "index.html"
-RewriteRule "@type/MediaObject" "index.html"
-RewriteRule "@type/ImageObject" "index.html"
-RewriteRule "@type/ExhibitionEvent" "index.html"
-RewriteRule "@type/CreativeWorkSeries" "index.html"
-RewriteRule "@type/Organization" "index.html"
-RewriteRule "@type/Place" "index.html"
-RewriteRule "@type/Person" "index.html"
-RewriteRule "@type/EventVenue" "index.html"
-RewriteRule "@type/Museum" "index.html"
-RewriteRule "@type/PerformingGroup" "index.html"
-RewriteRule "@type/VisualArtsEvent" "index.html"
+RewriteRule "^@type/Event$" "index.html"
+RewriteRule "^@type/Report$" "index.html"
+RewriteRule "^@type/VideoObject$" "index.html"
+RewriteRule "^@type/MediaObject$" "index.html"
+RewriteRule "^@type/ImageObject$" "index.html"
+RewriteRule "^@type/ExhibitionEvent$" "index.html"
+RewriteRule "^@type/CreativeWorkSeries$" "index.html"
+RewriteRule "^@type/Organization$" "index.html"
+RewriteRule "^@type/Place$" "index.html"
+RewriteRule "^@type/Person$" "index.html"
+RewriteRule "^@type/EventVenue$" "index.html"
+RewriteRule "^@type/Museum$" "index.html"
+RewriteRule "^@type/PerformingGroup$" "index.html"
+RewriteRule "^@type/VisualArtsEvent$" "index.html"