diff --git a/main/template/default/admin/questions.tpl b/main/template/default/admin/questions.tpl
index ab54744193..de3840f153 100644
--- a/main/template/default/admin/questions.tpl
+++ b/main/template/default/admin/questions.tpl
@@ -1,5 +1,5 @@
 {% extends 'layout/layout_1_col.tpl'|get_template %}
-{% import 'macro/macro.tpl'|get_template as display %}
+{% import 'default/macro/macro.tpl' as display %}
 
 {% block content %}
     {{ form }}
diff --git a/main/template/default/forum/list.tpl b/main/template/default/forum/list.tpl
index 83ff6e610b..b2c70025ea 100644
--- a/main/template/default/forum/list.tpl
+++ b/main/template/default/forum/list.tpl
@@ -1,4 +1,4 @@
-{% import 'macro/macro.tpl'|get_template as display %}
+{% import 'default/macro/macro.tpl' as display %}
 {% extends 'layout/layout_1_col.tpl'|get_template %}
 
 {% block content %}
diff --git a/main/template/default/forum/posts.tpl b/main/template/default/forum/posts.tpl
index 1f7a59de93..229af244bb 100644
--- a/main/template/default/forum/posts.tpl
+++ b/main/template/default/forum/posts.tpl
@@ -1,4 +1,4 @@
-{% import 'macro/macro.tpl'|get_template as display %}
+{% import 'default/macro/macro.tpl' as display %}
 {% extends 'layout/layout_1_col.tpl'|get_template %}
 
 {% block content %}
diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl
index f579891daf..54b183934b 100755
--- a/main/template/default/layout/layout_2_col.tpl
+++ b/main/template/default/layout/layout_2_col.tpl
@@ -1,5 +1,5 @@
 {% extends 'layout/page.tpl'|get_template %}
-{% import 'macro/macro.tpl'|get_template as display %}
+{% import 'default/macro/macro.tpl' as display %}
 
 {% block body %}
     {% if plugin_main_top %}
diff --git a/main/template/default/social/personal_data.tpl b/main/template/default/social/personal_data.tpl
index 999675369e..23d4c7bd0d 100644
--- a/main/template/default/social/personal_data.tpl
+++ b/main/template/default/social/personal_data.tpl
@@ -1,5 +1,5 @@
 {% extends 'layout/layout_1_col.tpl'|get_template %}
-{% import 'macro/macro.tpl'|get_template as display %}
+{% import 'default/macro/macro.tpl' as display %}
 
 {% block content %}
 <div class="row">
diff --git a/main/template/default/social/terms.tpl b/main/template/default/social/terms.tpl
index 335ff4ccf2..9f47e779ff 100644
--- a/main/template/default/social/terms.tpl
+++ b/main/template/default/social/terms.tpl
@@ -1,5 +1,5 @@
 {% extends 'layout/layout_1_col.tpl'|get_template %}
-{% import 'macro/macro.tpl'|get_template as display %}
+{% import 'default/macro/macro.tpl' as display %}
 
 {% block content %}
 <div class="row">
diff --git a/main/template/default/user_portal/classic_courses_with_category.tpl b/main/template/default/user_portal/classic_courses_with_category.tpl
index fccf51e222..29443e4bed 100644
--- a/main/template/default/user_portal/classic_courses_with_category.tpl
+++ b/main/template/default/user_portal/classic_courses_with_category.tpl
@@ -1,4 +1,4 @@
-{% import 'macro/macro.tpl'|get_template as display %}
+{% import 'default/macro/macro.tpl' as display %}
 
 {% if not categories is empty %}
     <div class="classic-courses">