diff --git a/app/Http/Controllers/EleveurController.php b/app/Http/Controllers/EleveurController.php
index 1c3e2c1..26b6d9c 100644
--- a/app/Http/Controllers/EleveurController.php
+++ b/app/Http/Controllers/EleveurController.php
@@ -60,19 +60,19 @@ class EleveurController extends Controller
         $eleveur->marquage_b1 = $request->marquage_b1;
         $eleveur->marquage_b2 = $request->marquage_b2;
 
-        if(isset($request->exploitation) && $request->exploitation != ""){
+        if(isset($request->exploitation) && !empty($request->exploitation)){
             $eleveur->exploitation = $request->exploitation;
         }
-        if(isset($request->aboutyou) && $request->aboutyou != ""){
+        if(isset($request->aboutyou) && !empty($request->aboutyou)){
             $eleveur->aboutyou = $request->aboutyou;
         }
-        if(isset($request->vocation) && $request->vocation != ""){
+        if(isset($request->vocation) && !empty($request->vocation)){
             $eleveur->vocation = $request->vocation;
         }
-        if(isset($request->likeinjob) && $request->likeinjob != ""){
+        if(isset($request->likeinjob) && !empty($request->likeinjob)){
             $eleveur->likeinjob = $request->likeinjob;
         }
-        if(isset($request->loue_means) && $request->loue_means != ""){
+        if(isset($request->loue_means) && !empty($request->loue_means)){
             $eleveur->loue_means = $request->loue_means;
         }
         if ($request->photo1){
diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
index 3ba5ef7..327786a 100644
--- a/app/Http/Controllers/FrontController.php
+++ b/app/Http/Controllers/FrontController.php
@@ -17,12 +17,13 @@ class FrontController extends Controller
         $multiple = false;
         $mobas = Moba::where('code_boite', $id)->get();
         $edes = $mobas->pluck('code_ede');
+        // TODO : Pourquoi dates ?
         $dates = $mobas->pluck('date_ponte');
-        
+
         if(count($mobas) == 0) {
             return redirect('/search');
         }
-        
+
         //check if Bio or not
         $code_ede = $mobas[0]->code_ede;
         $code_prod = substr($code_ede, 0, 1);
@@ -36,7 +37,7 @@ class FrontController extends Controller
         $datePonte = $mobas[0]->date_ponte;
         $dcr = $mobas[0]->dcr;
         $date_emballage = $mobas[0]->date_emballage;
-        //Compare DCR et Today 
+        //Compare DCR et Today
         $date_dcr = Carbon::createFromFormat('Y-m-d', $dcr);
         $date_today = Carbon::now();
         $dcrGood = $date_today < $date_dcr;
@@ -63,13 +64,13 @@ class FrontController extends Controller
             $aliment ="";
         }
         $dataVisuel = VisuelLibelle::where('ean13', $mobas[0]->ean13)->first();
-       
+
         return view('themes.loue.index_id', [
-            'id' => $id, 
-            'multiple' => $multiple, 
-            'datePonte' => $datePonte, 
-            'dcr' => $dcr, 
-            'dcrGood' => $dcrGood, 
+            'id' => $id,
+            'multiple' => $multiple,
+            'datePonte' => $datePonte,
+            'dcr' => $dcr,
+            'dcrGood' => $dcrGood,
             'eleveurs' => $eleveurs,
             'mep' => $mep,
             'aliment' => $aliment,
@@ -83,15 +84,15 @@ class FrontController extends Controller
         $currentYear = $dateToday['year'];
 
         $eleveur = Eleveur::where('id', $eleveurId)->first();
-        
-        if(isset($eleveur->naissance) && $eleveur->naissance != ""){    
+
+        if(isset($eleveur->naissance) && !empty($eleveur->naissance)){
             $date_naissance = Carbon::createFromFormat('d/m/Y', $eleveur->naissance)->toArray();
             $year = $date_naissance['year'];
             $age = $currentYear - $year;
         } else {
             $age = false;
         }
-        if(isset($eleveur->elv_date_debut) && $eleveur->elv_date_debut != ""){
+        if(isset($eleveur->elv_date_debut) && !empty($eleveur->elv_date_debut)){
             $date_elevage = Carbon::createFromFormat('d/m/Y', $eleveur->elv_date_debut)->toArray();
             $year_elevage = $date_elevage['year'];
             $age_elevage = $currentYear - $year_elevage;
@@ -100,10 +101,10 @@ class FrontController extends Controller
         }
 
         $questions = array();
-        if($eleveur->aboutyou != null && $eleveur->aboutyou != ''){
+        if($eleveur->aboutyou != null && !empty($eleveur->aboutyou)){
             array_push($questions, array('Parle nous un peu de toi...', $eleveur->aboutyou));
         }
-        if($eleveur->vocation != null && $eleveur->vocation != ''){
+        if($eleveur->vocation != null && !empty($eleveur->vocation)){
             switch ($eleveur->civilite) {
                 case '0':
                     array_push($questions, array('Tu as toujours été éleveuse ?', $eleveur->vocation));
@@ -115,18 +116,18 @@ class FrontController extends Controller
                     array_push($questions, array('Vous avez toujours été éleveuses ?', $eleveur->vocation));
                     break;
                 case '3':
-                    array_push($questions, array('Vous avez toujours été éleveurs ?', $eleveur->vocation)); 
+                    array_push($questions, array('Vous avez toujours été éleveurs ?', $eleveur->vocation));
                     break;
                 default:
                     array_push($questions, array('Tu as toujours été éleveur ?', $eleveur->vocation));
                     break;
             }
-            
+
         }
-        if($eleveur->likeinjob != null && $eleveur->likeinjob != ''){
+        if($eleveur->likeinjob != null && !empty($eleveur->likeinjob)){
             array_push($questions, array('Dis nous ce que tu aimes dans ton travail', $eleveur->likeinjob));
         }
-        if($eleveur->loue_means != null && $eleveur->loue_means != ''){
+        if($eleveur->loue_means != null && !empty($eleveur->loue_means)){
             array_push($questions, array('Si je te dis Loué, ça te fait penser à quoi ?', $eleveur->loue_means));
         }