diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html
index 65cd841f..11f5e735 100644
--- a/templates/client/accounts/feed.html
+++ b/templates/client/accounts/feed.html
@@ -57,11 +57,11 @@
                     <div class="search-modal-body">
 
                         {% if search_form.th %}
-                        {% include 'client/popups/theme.html' with search_form=search_form filter="filter-" formId="filter-pwSubj" selectedItemTemplate="filter-subj-selected" autoCompleteId="filter-subj-complete-block" filterInputId="filter-subj-fliter-input" selectedItemsContainer="filter-csb-subj-selected-items" subjectTriggerWrapId="filter-subj-checks" exhibitionCheck="filter-exhibition-check" conferenceCheck="filter-conference-check" prefix="f-s-" %}
+                        {% include 'client/popups/theme.html' with search_form=search_form filter="filter-" formId="filter-pwSubj" selectedItemTemplate="filter-subj-selected" autoCompleteId="filter-subj-complete-block" filterInputId="filter-subj-fliter-input" selectedItemsContainer="filter-csb-subj-selected-items" subjectTriggerWrapId="filter-subj-checks" exhibitionCheck="filter-exhibition-check" conferenceCheck="filter-conference-check" prefix="f-s-" submitText="Применить" %}
                         {% endif %}
 
                         {% if search_form.area %}
-                        {% include 'client/popups/place.html' with search_form=search_form filter="filter-" formId="filter-pwPlace" selectedItemTemplate="filter-csb-selected" autoCompleteId="filter-place-complete-block" filterInputId="filter-place-filter-input" selectedItemsContainer="filter-csb-selected-items" prefix="f-p-" %}
+                        {% include 'client/popups/place.html' with search_form=search_form filter="filter-" formId="filter-pwPlace" selectedItemTemplate="filter-csb-selected" autoCompleteId="filter-place-complete-block" filterInputId="filter-place-filter-input" selectedItemsContainer="filter-csb-selected-items" prefix="f-p-" submitText="Применить" %}
                         {% endif %}
 
                     </div>
@@ -73,95 +73,96 @@
 
         </form>
     </div>
+    </div>
 
     {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
 
     {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-{% endblock %}
-{% block scripts %}
-        <script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>
-        <!--<script src="{% static 'client/js/_modules/block.search.js' %}"></script>-->
+    <script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>
+    <!--<script src="{% static 'client/js/_modules/block.search.js' %}"></script>-->
+
+    <script>
+        EXPO.events.feed.init({
+            bodyId:'events-filter-wrap',
+            formId: 'filter-block-form',
+            activeClass:'active',
+            modalTriggerClass:'filter-modal-open',
+            searchData:'{{ filter_form.data_with_parents|safe }}',
+            closerText: "{% trans ' и еще _ позиции' %}",
+            closerTextSingle:"{% trans ' и еще _ позиция' %}",
+            applyButtonId:'apply-filter-button',
+            place:{
+                id:'filter-pwPlace',
+                 selectedItemTemplate:'filter-csb-selected',
+                ajaxUrl:'http://{{ request.get_host }}/search-form/',
+                autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/',
+                getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
+                autoCompleteId:'filter-place-complete-block',
+                filterInputId:'filter-place-filter-input',
+                modalTrigger:'filter-place-modal-trigger',
+                selectedItemsContainer:'filter-csb-selected-items',
+                clearAllButtonClass:'clear-all-button',
+                applyBtnClass:'modal-approve',
+                tagsBoxId:'filter-places-tags',
+                deleteTagClass:'csbs-del',
+                bodyId:'events-filter-wrap',
 
-        <script>
-            EXPO.events.feed.init({
+                prefix:'f-p-',
+                deleteId:'place-tag-remove',
+                labelId:'filter-place-label'
+
+
+
+            },
+            subject:{
+                id:'filter-pwSubj',
+                selectedItemTemplate:'filter-subj-selected',
+                autoCompleteId:'filter-subj-complete-block',
+                ajaxUrl:'http://{{ request.get_host }}/search-form/',
+                autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/',
+                filterInputId:'filter-subj-fliter-input',
+                modalTrigger:'fiter-subj-modal-trigger',
+                getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
+                selectedItemsContainer:'filter-csb-subj-selected-items',
+                subjectTriggerWrapId:'filter-subj-checks',
+                //switched by default
+                defaultOn:['f-s-exhibition-check','f-s-conference-check'],
+                clearAllButtonClass:'clear-all-button',
+                applyBtnClass:'modal-approve',
+                tagsBoxId:'filter-subject-tags',
+                deleteTagClass:'csbs-del',
                 bodyId:'events-filter-wrap',
-                formId: 'filter-block-form',
-                activeClass:'active',
-                modalTriggerClass:'filter-modal-open',
-                searchData:'{{ filter_form.data_with_parents|safe }}',
-                closerText: "{% trans ' и еще _ позиции' %}",
-                closerTextSingle:"{% trans ' и еще _ позиция' %}",
-                applyButtonId:'apply-filter-button',
-                place:{
-                    id:'filter-pwPlace',
-                   /**/ selectedItemTemplate:'filter-csb-selected',
-                    ajaxUrl:'http://{{ request.get_host }}/search-form/',
-                    autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/',
-                    getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
-                    /**/autoCompleteId:'filter-place-complete-block',
-                    /**/filterInputId:'filter-place-filter-input',
-                    modalTrigger:'filter-place-modal-trigger',
-                    /**/selectedItemsContainer:'filter-csb-selected-items',
-                    clearAllButtonClass:'clear-all-button',
-                    applyBtnClass:'modal-approve',
-                    tagsBoxId:'filter-places-tags',
-                    deleteTagClass:'csbs-del',
-                    bodyId:'events-filter-wrap',
-
-                    prefix:'f-p-',
-                    deleteId:'place-tag-remove',
-                    labelId:'filter-place-label'
-
-
-
-                },
-                subject:{
-                    id:'filter-pwSubj',
-                    /**/selectedItemTemplate:'filter-subj-selected',
-                    /**/autoCompleteId:'filter-subj-complete-block',
-                    ajaxUrl:'http://{{ request.get_host }}/search-form/',
-                    autoCompleteUrl:'http://{{ request.get_host }}/search-form/autocomplete/',
-                    /**/filterInputId:'filter-subj-fliter-input',
-                    modalTrigger:'fiter-subj-modal-trigger',
-                    getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
-                    /**/selectedItemsContainer:'filter-csb-subj-selected-items',
-                    /**/subjectTriggerWrapId:'filter-subj-checks',
-                    //switched by default
-                    defaultOn:['f-s-exhibition-check','f-s-conference-check'],
-                    clearAllButtonClass:'clear-all-button',
-                    applyBtnClass:'modal-approve',
-                    tagsBoxId:'filter-subject-tags',
-                    deleteTagClass:'csbs-del',
-                    bodyId:'events-filter-wrap',
-                    prefix:'f-s-',
-                    deleteId:'subject-tag-remove',
-
-                    labelId:'filter-subject-label'
-
-
-                },
-
-                filter: {
-                    wrapperId:'"events-filter-wrap"',
-                    bodyId:'events-filter',
-                    buttonId:'filter-show-button'
-
-                },
-                modal:{
-                    id:'filter-modal',
-                    wrapClass:'search-modal-wrap',
-                    size:{
-                        'filter-pwSubj':{
-                            width:640,
-                            height:514
-                        },
-                        'filter-pwPlace':{
-                            width:640,
-                            height:460
-                        }
+                prefix:'f-s-',
+                deleteId:'subject-tag-remove',
+
+                labelId:'filter-subject-label'
+
+
+            },
+
+            filter: {
+                wrapperId:'"events-filter-wrap"',
+                bodyId:'events-filter',
+                buttonId:'filter-show-button'
+
+            },
+            modal:{
+                id:'filter-modal',
+                wrapClass:'search-modal-wrap',
+                size:{
+                    'filter-pwSubj':{
+                        width:640,
+                        height:514
+                    },
+                    'filter-pwPlace':{
+                        width:640,
+                        height:460
                     }
-
                 }
-            });
-        </script>
+
+            }
+        });
+    </script>
 {% endblock %}
+
+
diff --git a/templates/client/popups/place.html b/templates/client/popups/place.html
index 2f085630..c29147e2 100644
--- a/templates/client/popups/place.html
+++ b/templates/client/popups/place.html
@@ -108,7 +108,7 @@
 				</div>
 			</div>
 			<div class="pwf-buttons-line">
-				<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
+				<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
 				{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 			</div>
 		</div>
diff --git a/templates/client/popups/theme.html b/templates/client/popups/theme.html
index e4a1a699..2a4a7a4d 100644
--- a/templates/client/popups/theme.html
+++ b/templates/client/popups/theme.html
@@ -76,7 +76,7 @@
 						</div>
 					</div>
 					<div class="pwf-buttons-line">
-						<button class="icon-check modal-approve" type="submit">{% trans 'Искать' %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
+						<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
 						{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 					</div>
 				</div>