diff --git a/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php b/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php
index c0df49717d..cf0a3b940c 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php
@@ -54,18 +54,20 @@ class RecordSubscriber implements EventSubscriberInterface
         if (!$record->isStory()) {
             $subdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType());
 
-            foreach ($subdefs as $subdef) {
-                $payload = [
-                    'message_type' => MessagePublisher::SUBDEF_CREATION_TYPE,
-                    'payload' => [
-                        'recordId'      => $event->getRecord()->getRecordId(),
-                        'databoxId'     => $event->getRecord()->getDataboxId(),
-                        'subdefName'    => $subdef->get_name(),
-                        'status'        => $event->isNewRecord() ? MessagePublisher::NEW_RECORD_MESSAGE : ''
-                    ]
-                ];
+            if ($subdefs !== null) {
+                foreach ($subdefs as $subdef) {
+                    $payload = [
+                        'message_type' => MessagePublisher::SUBDEF_CREATION_TYPE,
+                        'payload' => [
+                            'recordId'      => $event->getRecord()->getRecordId(),
+                            'databoxId'     => $event->getRecord()->getDataboxId(),
+                            'subdefName'    => $subdef->get_name(),
+                            'status'        => $event->isNewRecord() ? MessagePublisher::NEW_RECORD_MESSAGE : ''
+                        ]
+                    ];
 
-                $this->messagePublisher->publishMessage($payload, MessagePublisher::SUBDEF_QUEUE);
+                    $this->messagePublisher->publishMessage($payload, MessagePublisher::SUBDEF_QUEUE);
+                }
             }
         }
     }
diff --git a/package.json b/package.json
index 062865c82a..20d2c861a9 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "normalize-css": "^2.1.0",
     "npm": "^6.0.0",
     "npm-modernizr": "^2.8.3",
-    "phraseanet-production-client": "0.34.214-d",
+    "phraseanet-production-client": "0.34.219-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig
index 2618d70e22..4ac0e0f25e 100644
--- a/templates/web/prod/WorkZone/Browser/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig
@@ -1,6 +1,6 @@
 <div class="PNB">
   <div class="PNB header" style="height:40px;bottom:auto;">
-    <table>
+    <table class="detailed_basket_browser">
       <tr>
         <td style="width:230px;">
           <a href="#" class="back">
@@ -23,9 +23,9 @@
               </span>
             </a>
             {% endif %}
-            <a class="basket_link" href="#">
-              {{ Basket.getName() }}
-            </a>
+            <span class="basket_link" title="{{ Basket.getName() }}">
+              {{ Basket.getName()|length > 55 ? Basket.getName()|slice(0, 52) ~ '...' : Basket.getName()  }}
+            </span>
           </h1>
         </td>
       </tr>
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig
index 9ac3a5fa06..ee9f1f5d18 100644
--- a/templates/web/prod/WorkZone/Browser/Results.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Results.html.twig
@@ -40,8 +40,8 @@
                  &nbsp;
                 </a>
                 {% endif %}
-                <a class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}">
-                    <span>{{ Basket.getName() }}</span>
+                <a title="{{ Basket.getName()}}" class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}">
+                    <span> {{ Basket.getName()|length > 80 ? Basket.getName()|slice(0, 77) ~ '...' : Basket.getName()  }}</span>
                 <br><span class="basketCount">
                         {{ Basket.getElements().count() }} {{ ' records' }}
                   </span></a>
diff --git a/yarn.lock b/yarn.lock
index f641a68101..2940fd971a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.214-d:
-  version "0.34.214-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.214-d.tgz#55675c3925c81626ddd8b9498e02c9d106a51d93"
-  integrity sha512-RXg7KMgpPtv4rR3c2tCNMr7RgneAZjvBbFyGVx+a42nPkkZMnulweDm1R2o5d/eOcW6uJWPWczSmCCS0GqNnVQ==
+phraseanet-production-client@0.34.219-d:
+  version "0.34.219-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.219-d.tgz#9bd118d0588af0ca58b60ef6b8f2514b6a9ffe63"
+  integrity sha512-QHLsPBRjtE4wSH5jib6gN71U70lAtoloM5E+NfmFKHLBMv0B8xqcxJKVW7EbRX4DZTpsLCu5tuZ7vzd5PpbkOg==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"