diff --git a/resources/www/_shared/styles/main.scss b/resources/www/_shared/styles/main.scss
index 56a92e893c..9a2f64b700 100644
--- a/resources/www/_shared/styles/main.scss
+++ b/resources/www/_shared/styles/main.scss
@@ -49,6 +49,10 @@ img{
   bottom:10px;
 }
 
+.documentTips {
+  height: 100%;
+}
+
 input.checkbox{
   background:transparent;
   border:none;
diff --git a/resources/www/common/js/components/tooltip.js b/resources/www/common/js/components/tooltip.js
index df5a28d554..5839535210 100644
--- a/resources/www/common/js/components/tooltip.js
+++ b/resources/www/common/js/components/tooltip.js
@@ -284,8 +284,9 @@
             }
 
             else if ($documentTips[0] && shouldResize) {
-                recordWidth = $documentTips.data('original-width');
-                recordHeight = $documentTips.data('original-height');
+                //add min width and height of 400 and 600 respectively
+                recordWidth = $documentTips.data('original-width') > 400 ? $documentTips.data('original-width') : 400;
+                recordHeight = $documentTips.data('original-width') > 400 ? $documentTips.data('original-height') : 600;
                 $documentTips.css({display: 'block', margin: '0 auto'});
                 $selector = $documentTips;
             }
@@ -377,7 +378,7 @@
                     bottomOffset = -15;
                 } else {
                     // tooltip from workzone (basket)
-                    tooltipVerticalOffset = 0;
+                    //tooltipVerticalOffset = 0;
                     tooltipHorizontalOffset = 0;
                     topOffset = 50;
                     // fallback on original target if nothing found:
diff --git a/resources/www/lightbox/styles/main.scss b/resources/www/lightbox/styles/main.scss
index c7e460aad1..c31ab9a73d 100644
--- a/resources/www/lightbox/styles/main.scss
+++ b/resources/www/lightbox/styles/main.scss
@@ -46,7 +46,11 @@ img {
 }
 
 #top_container {
-  bottom: 190px;
+  bottom: 220px;
+}
+
+.documentTips {
+  height: 100%;
 }
 
 #bottom_container {
diff --git a/resources/www/prod/js/jquery.main-prod.js b/resources/www/prod/js/jquery.main-prod.js
index f7cc9708bc..f1ef70c798 100644
--- a/resources/www/prod/js/jquery.main-prod.js
+++ b/resources/www/prod/js/jquery.main-prod.js
@@ -518,7 +518,6 @@ function initAnswerForm() {
                 $('#answers').removeClass('loading');
             },
             success: function (datas) {
-
                 // DEBUG QUERY PARSER
                 try {
                     console.info(JSON.parse(datas.parsed_query));
@@ -533,6 +532,10 @@ function initAnswerForm() {
 
                 loadFacets(datas.facets);
 
+                if(datas.total_answers > 0) {
+                    sessionStorage.setItem('search', JSON.stringify(datas.query));
+                }
+
                 $('#answers').append('<div id="paginate"><div class="navigation"><div id="tool_navigate"></div></div></div>');
 
                 $('#tool_results').empty().append(datas.infos);
diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig
index 742951f08b..f4aa9f11e7 100644
--- a/templates/web/common/thumbnail.html.twig
+++ b/templates/web/common/thumbnail.html.twig
@@ -6,7 +6,7 @@
     {% set original_h = thumbnail.get_height() > 0 ? thumbnail.get_height() : 120 %}
     {% set original_w = thumbnail.get_width() > 0 ? thumbnail.get_width() : 120 %}
     {% if wrap %}
-        <div style="width:{{box_w}}px;height:{{box_h}}px;" class="thumb_wrapper {{extra_class|default('')}}" >
+        <div style="width:100%; height:100%;" class="thumb_wrapper {{extra_class|default('')}}" >
     {% endif %}
 
     {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %}
@@ -19,8 +19,11 @@
         <div id="phraseanet-embed-frame" class="documentTips"
              data-original-width="{{original_w}}"
              data-original-height="{{original_h}}"
-             data-kind="document"
-             data-src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"></div>
+             data-kind="document">
+
+        </div>
+
+
     {% elseif record_type == 'AUDIO_MP3' %}
         <div id="phraseanet-embed-frame" class="audioTips"
              data-original-width="{{original_w}}"