diff --git a/batiskaf/templates/jinja2/category.jinja b/batiskaf/templates/jinja2/category.jinja
index b43e0a2..457b93e 100644
--- a/batiskaf/templates/jinja2/category.jinja
+++ b/batiskaf/templates/jinja2/category.jinja
@@ -1,6 +1,10 @@
 {% extends 'base.jinja' %}
 {% block title %}
+    {% if category %}
 {{ category.title }}{% for parent in category.get_parents() %} > {{ parent.title }}{% endfor %}
+        {% else %}
+        Поиск по запросу {{ request.GET['q'] }}
+    {% endif %}
 {% endblock %}
 {% block content %}
     <div class=" breadcrumbs">
@@ -12,7 +16,7 @@
             {% endfor %}
             <li class="active"><span>{{ category.title }}</span></li>
             {% else %}
-            <li class="active"><span>Поиск</span></li>
+            <li class="active"><span>Поиск по запросу {{ request.GET['q'] }}</span></li>
         {% endif %}
 
         </ol>
diff --git a/batiskaf/templates/jinja2/product.jinja b/batiskaf/templates/jinja2/product.jinja
index cbf0cf3..eba61fd 100644
--- a/batiskaf/templates/jinja2/product.jinja
+++ b/batiskaf/templates/jinja2/product.jinja
@@ -1,6 +1,7 @@
 {% extends 'base.jinja' %}
 {% block title %}
-{{ product.title }} : {% for parent in category.get_parents() %}{{ parent.title }} > {% endfor %}{{ category.title }}
+    {{ product.title }} :
+    {% for parent in category.get_parents() %}{{ parent.title }} > {% endfor %}{{ category.title }}
 {% endblock %}
 {% block content %}
     <div class=" breadcrumbs">
@@ -20,14 +21,16 @@
                     {% set im = image.image|thumbnail("80x80") %}
                     {% set im_big = image.image|thumbnail("398x398") %}
                     <a href="/static/{{ im_big.url }}" data-big-url="/static/{{ image.image.url }}"><img
-                            src="/static/{{ im.url }}"  alt="{{ product.title }}" title="{{ product.title }}" class="img-thumbnail"/></a>
+                            src="/static/{{ im.url }}" alt="{{ product.title }}" title="{{ product.title }}"
+                            class="img-thumbnail"/></a>
                 {% endfor %}
             </div>
             <div class="product-big-thumbnail col-xs-10">
                 <div class="product-big-thumbnail-container">
                     {% set im = product.main_image()|thumbnail("398x398") %}
                     <!-- <a href="/static/{{ product.main_image().url }}" id="product-big-image-url"> -->
-                    <img src="/static/{{ im.url }}"  alt="{{ product.title }}" title="{{ product.title }}" width="398" height="392" id='product-big-img' class=""
+                    <img src="/static/{{ im.url }}" alt="{{ product.title }}" title="{{ product.title }}" width="398"
+                         height="392" id='product-big-img' class=""
                          data-zoom-image='/static/{{ product.main_image().url }}'/>
                     <!-- </a> -->
                 </div>