diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8a9bf9b5..f24b39fc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       # contains refarm-site modules
       - $DEPS_DIR
       # Thus, you can work with apps related to the refarm-site
-      # - $REFARM_SRC/stbarch:/root/.local/lib/python3.6/site-packages/stbarch
+      #- $REFARM_DIR/stbarch:/root/.local/lib/python3.6/site-packages/stbarch
     # @todo #150 Validate if `.env` is full
     #  Is full means '.env` contains all keynames from `.env.dist`
     command: python manage.py runserver 0.0.0.0:$VIRTUAL_HOST_PORT
@@ -35,7 +35,7 @@ services:
   nodejs:
     image: fidals/stb-nodejs:dev
     volumes:
-      # for SE's front development
+      # for STB's front development
       - ../gulpfile.babel.js:/usr/app/src/gulpfile.babel.js
       - ../package.json:/usr/app/src/package.json
       - ../front:/usr/app/src/front
diff --git a/requirements.txt b/requirements.txt
index d83155fe..bd8bfb05 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,4 +15,4 @@ Unidecode==1.0.22
 ua-parser==0.8.0
 user-agents==1.1.0
 https://github.com/selwin/django-user_agents/archive/master.zip
-https://github.com/fidals/refarm-site/archive/0.1.6.zip
+https://github.com/fidals/refarm-site/archive/0.1.7.zip
diff --git a/stroyprombeton/settings/base.py b/stroyprombeton/settings/base.py
index e34a2f37..13ba258f 100644
--- a/stroyprombeton/settings/base.py
+++ b/stroyprombeton/settings/base.py
@@ -51,6 +51,7 @@
     'django.contrib.admin',
     'django_select2',
     'images',
+    'refarm_redirects',
     'pages',
     'search',
     'catalog',
@@ -72,6 +73,7 @@
     'django.middleware.locale.LocaleMiddleware',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django_user_agents.middleware.UserAgentMiddleware',
+    'refarm_redirects.middleware.RedirectAllMiddleware',
 ]
 
 ROOT_URLCONF = 'stroyprombeton.urls'
diff --git a/stroyprombeton/tests/tests_selenium_admin.py b/stroyprombeton/tests/tests_selenium_admin.py
index 1fed009e..506a4186 100644
--- a/stroyprombeton/tests/tests_selenium_admin.py
+++ b/stroyprombeton/tests/tests_selenium_admin.py
@@ -563,6 +563,7 @@ def get_field_from_jqgrid(self, fieldname, row):
             if td.get_attribute('aria-describedby') == f'jqGrid_{fieldname}'
         )
 
+    # @todo #380:30m Resurrect test `test_mark_search_on_table_editor`
     @unittest.skip('Require filled value for marks.')
     def test_mark_search_on_table_editor(self):
         """