diff --git a/templates/client/includes/catalog_search_main.html b/templates/client/includes/catalog_search_main.html
index 98774287..8dcf2b0c 100644
--- a/templates/client/includes/catalog_search_main.html
+++ b/templates/client/includes/catalog_search_main.html
@@ -1,13 +1,10 @@
 {% load static %}
 {% load i18n %}
-
 <section class="layout mp-search search-form">
 	<div class="layout-wrap">
-
 		<aside>
 			<div class="s-title">{{ search_form.title }}</div>
 		</aside>
-
 		<div class="mcl">
 			<form id="search-block-form" action="{{ search_form.search_url }}">
 				<div class="search-form-wrap">
@@ -107,11 +104,14 @@
 				</div>
 			</form>
 		</div>
-
 	</div>
 	{% block scripts %}
 	<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
-	<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.search{% if debug %}{% else %}.min{% endif %}.js"></script>
+	{% if request.GET.debug == '1' %}
+	<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
+	{% else %}
+	<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
+	{% endif %}
 	<script>
 		var closerTextSingle = "{% trans ' и еще _ позиция' %}",
 				closerText = "{% trans ' и еще _ позиции' %}";
@@ -119,7 +119,6 @@
 			closerTextSingle = "{% trans ' и еще _' %}";
 			closerText = "{% trans ' и еще _' %}";
 		}
-
 		EXPO.searchBlock.init({
 			formId: 'search-block-form',
 			modalTriggerClass:'search-modal-open',
@@ -138,7 +137,6 @@
 				selectedItemsContainer:'csb-selected-items',
 				clearAllButtonClass:'clear-all-button',
 				applyBtnClass:'modal-approve'
-
 			},
 			subject:{
 				id:'pwSubj',
@@ -151,10 +149,8 @@
 				getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
 				selectedItemsContainer:'csb-subj-selected-items',
 				subjectTriggerWrapId:'subj-checks',
-				//switched by default
 				defaultOn:['exhibition-check','conference-check'],
 				clearAllButtonClass:'clear-all-button',
-
 				applyBtnClass:'modal-approve'
 			},
 			period:{
@@ -163,7 +159,6 @@
 				dateFrom:'dateFrom',
 				modalTrigger:'period-modal-trigger',
 				clearAllButtonClass:'clear-all-button',
-
 				applyBtnClass:'modal-approve'
 			},
 			firstField:{
@@ -196,9 +191,7 @@
 						height:460
 					}
 				}
-
 			}
-
 		});
 	</script>