diff --git a/application/modules/opac/controllers/NoticeajaxController.php b/application/modules/opac/controllers/NoticeajaxController.php
index 5f26495e0218162fdc3870c526d1d9dc7442ff62..aef7f6ada28baa6e8200e9069b2fbf65a1f8d9ae 100644
--- a/application/modules/opac/controllers/NoticeajaxController.php
+++ b/application/modules/opac/controllers/NoticeajaxController.php
@@ -349,96 +349,15 @@ class NoticeAjaxController extends Zend_Controller_Action {
 	}
 
 
-	public function frbrAction() {
-		$noResultMessage = $this->view->_('Aucun lien n\'a été trouvé');
-		$id = str_replace('N', '', $this->_getParam('id_notice'));
-		
-		if (!$model = Class_Notice::find((int)$id)) {
-			$this->_sendResponse($noResultMessage);
-			return;
-		}
-		
-		$sourceLinks = $model->getLinksAsSource();
-		$targetLinks = $model->getLinksAsTarget();
-		
-		if (0 == count($sourceLinks) and 0 == count($targetLinks)) {
-			$this->_sendResponse($noResultMessage);
-			return;
-		}
-
-		$html = '';
-		foreach ($this->_getLinksBySourceTypes($sourceLinks) as $label => $links)
-			$html .= $this->_getTargetTypeLinks($label, $links);
-
-		foreach ($this->_getLinksByTargetTypes($targetLinks) as $label => $links)
-			$html .= $this->_getSourceTypeLinks($label, $links);
-
-		if ('' == $html)
-			$html = $noResultMessage;
-
-		$this->_sendResponse($html);
-	}
-
-
-	protected function _getLinksBySourceTypes($links) {
-		return $this->_getLinksByType($links, function ($link) {
-			return $link->getTypeLabelFromSource();
-		});
-	}
-
-
-	protected function _getLinksByTargetTypes($links) {
-		return $this->_getLinksByType($links, function ($link) {
-			return $link->getTypeLabelFromTarget();
-		});
-	}
-
-
-  protected function _getLinksByType($links, $callback) {
-		$byTypes = [];
-		foreach ($links as $link) {
-			$typeLabel = $callback($link);
-			if (!array_key_exists($typeLabel, $byTypes))
-				$byTypes[$typeLabel] = [];
-			
-			$byTypes[$typeLabel][] = $link;
-		}
-		return $byTypes;
-	}
-
-
-	protected function _getTargetTypeLinks($label, $links) {
-		return $this->_getTypeLinks($label, $links, function($link) {
-			return $link->getTargetNotice();
-		});
-	}
-
-
-	protected function _getSourceTypeLinks($label, $links) {
-		return $this->_getTypeLinks($label, $links, function($link) {
-			return $link->getSourceNotice();
-		});
-	}
-
-
-  protected function _getTypeLinks($label, $links, $callback) {
-		$html = '';
-		if (!$links)
-			return $html;
-
-		$html .= '<div class="notice_info_titre">' . $label . '</div>';
-		$notices = [];
-		foreach ($links as $link) {
-			if ($model = $callback($link))
-				$notices[] = $model;
-		}
-
-		if (empty($notices))
-			return '';
-		
-		$html .= $this->notice_html->getListeNotices($notices, $this->view);
-				
-		return $html;
+	public function frbrAction() {		
+	  $id = str_replace('N', '', $this->_getParam('id_notice'));
+
+	  if (!$model = Class_Notice::find((int)$id)) {
+	    $this->_sendResponse(ZendAfi_View_Helper_Frbr::NO_RESULT_MESSAGE);
+	    return;
+	  }
+ 
+	  $this->_sendResponse($this->view->frbr($model));
 	}
 
 
@@ -446,4 +365,4 @@ class NoticeAjaxController extends Zend_Controller_Action {
 		$this->getResponse()->setHeader('Content-Type', 'text/html;charset=utf-8');
 		$this->getResponse()->setBody($html);
 	}
-}
\ No newline at end of file
+} 
diff --git a/library/ZendAfi/View/Helper/Frbr.php b/library/ZendAfi/View/Helper/Frbr.php
index 87b27b7d136a772774fce1beec72e19a4c84d3e4..7b531d03489b8f5f2a1bcff29f936b3b65b1ae1f 100644
--- a/library/ZendAfi/View/Helper/Frbr.php
+++ b/library/ZendAfi/View/Helper/Frbr.php
@@ -33,10 +33,8 @@ class ZendAfi_View_Helper_Frbr extends Zend_View_Helper_HtmlElement{
     $sourceLinks = $model->getLinksAsSource();
     $targetLinks = $model->getLinksAsTarget();
 
-    if (0 == count($sourceLinks) and 0 == count($targetLinks)) {
-      
-      return self::NO_RESULT_MESSAGE; }
-
+    if (0 == count($sourceLinks) and 0 == count($targetLinks))
+      return self::NO_RESULT_MESSAGE;
     
     $html = '';
     foreach ($this->_getLinksBySourceTypes($sourceLinks) as $label => $links)
@@ -44,6 +42,10 @@ class ZendAfi_View_Helper_Frbr extends Zend_View_Helper_HtmlElement{
     
     foreach ($this->_getLinksByTargetTypes($targetLinks) as $label => $links)
       $html .= $this->_getSourceTypeLinks($label, $links);
+
+    if ('' == $html)
+      return self::NO_RESULT_MESSAGE;
+
     return $html;
   }
   
@@ -96,15 +98,18 @@ class ZendAfi_View_Helper_Frbr extends Zend_View_Helper_HtmlElement{
       
       $html .= '<div class="notice_info_titre">' . $label . '</div>';
       $notices = [];
-      foreach ($links as $link)
-	$notices[] = $callback($link);
+      foreach ($links as $link) {
+	if ($model = $callback($link))
+	  $notices[] = $model;
+      }
+
+      if (empty($notices))
+	return '';
       
       $html .= $this->notice_html->getListeNotices($notices, $this->view);
       
       return $html;
     }
-  
-
 }