diff --git a/app/corpora/routes.py b/app/corpora/routes.py
index 2db52331ecf4a504e2e797e91cda9e5d10e1a0cf..66e6c2df95a984097d32cad9c624b9a457d49c3e 100644
--- a/app/corpora/routes.py
+++ b/app/corpora/routes.py
@@ -97,14 +97,14 @@ def analysis(corpus_id):
     )
 
 
-# @bp.route('/<hashid:corpus_id>/follow/<token>')
-# def follow_corpus(corpus_id, token):
-#     corpus = Corpus.query.get_or_404(corpus_id)
-#     if current_user.follow_corpus_by_token(token):
-#         db.session.commit()
-#         flash(f'You are following "{corpus.title}" now', category='corpus')
-#         return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
-#     abort(403)
+@bp.route('/<hashid:corpus_id>/follow/<token>')
+def follow_corpus(corpus_id, token):
+    corpus = Corpus.query.get_or_404(corpus_id)
+    if current_user.follow_corpus_by_token(token):
+        db.session.commit()
+        flash(f'You are following "{corpus.title}" now', category='corpus')
+        return redirect(url_for('corpora.corpus', corpus_id=corpus_id))
+    abort(403)
 
 
 @bp.route('/import', methods=['GET', 'POST'])
diff --git a/app/templates/_base/scripts.html.j2 b/app/templates/_base/scripts.html.j2
index 91d44ada7b2a4da1e5ed541ceb78c09ce3d435b3..663693f66efccb2b37716971c8b0ba97815530de 100644
--- a/app/templates/_base/scripts.html.j2
+++ b/app/templates/_base/scripts.html.j2
@@ -135,9 +135,11 @@
 <script>
   let languageSwitch = document.querySelector('#terms-of-use-modal-switch');
   let termsOfUseContent = document.querySelectorAll('.terms-of-use-modal-content');
-  languageSwitch.addEventListener('change', function() {
-    termsOfUseContent.forEach(content => {
-      content.classList.toggle('hide');
+  if (languageSwitch) {
+    languageSwitch.addEventListener('change', function() {
+      termsOfUseContent.forEach(content => {
+        content.classList.toggle('hide');
+      });
     });
-  });
+  }
 </script>
diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2
index 5c6556c8ac4fe07d3c047af425bcb15392c7cc41..663cf49bfcc7c5f84914b51ea57e3f4ccaeb15d6 100644
--- a/app/templates/corpora/public_corpus.html.j2
+++ b/app/templates/corpora/public_corpus.html.j2
@@ -273,7 +273,7 @@ publicCorpusFollowerList.add(
 {% if cfr.has_permission('MANAGE_FILES') %}
 let followerBuildRequest = document.querySelector('#follower-build-request');
 followerBuildRequest.addEventListener('click', () => {
-  requests.corpora.entity.build({{ corpus.hashid|tojson }})
+  nopaque.requests.corpora.entity.build({{ corpus.hashid|tojson }})
     .then((response) => {
       window.location.reload();
     });
@@ -285,7 +285,7 @@ followerBuildRequest.addEventListener('click', () => {
 {% if current_user.is_following_corpus(corpus) %}
   let unfollowRequestElement = document.querySelector('.action-button[data-action="unfollow-request"]');
   unfollowRequestElement.addEventListener('click', () => {
-    requests.corpora.entity.followers.entity.delete({{ corpus.hashid|tojson }}, {{ current_user.hashid|tojson }})
+    nopaque.requests.corpora.entity.followers.entity.delete({{ corpus.hashid|tojson }}, {{ current_user.hashid|tojson }})
       .then((response) => {
         window.location.reload();
       });
@@ -335,7 +335,7 @@ M.Modal.init(
 
 inviteUserModalInviteButtonElement.addEventListener('click', (event) => {
   let usernames = inviteUserModalSearch.chipsData.map((chipData) => chipData.tag);
-  requests.corpora.entity.followers.add({{ corpus.hashid|tojson }}, usernames)
+  nopaque.requests.corpora.entity.followers.add({{ corpus.hashid|tojson }}, usernames)
     .then((response) => {
       window.location.reload();
     });
@@ -383,7 +383,7 @@ M.Modal.init(
 shareLinkModalCreateButtonElement.addEventListener('click', (event) => {
   let role = shareLinkModalCorpusFollowerRoleSelectElement.value;
   let expiration = shareLinkModalExpirationDateDatepickerElement.value
-  requests.corpora.entity.generateShareLink({{ corpus.hashid|tojson }}, role, expiration)
+  nopaque.requests.corpora.entity.generateShareLink({{ corpus.hashid|tojson }}, role, expiration)
     .then((response) => {
       response.json()
         .then((json) => {