diff --git a/Form/Type/Export/ExportType.php b/Form/Type/Export/ExportType.php
index 4bab1bcf2..a8c68967e 100644
--- a/Form/Type/Export/ExportType.php
+++ b/Form/Type/Export/ExportType.php
@@ -64,28 +64,11 @@ class ExportType extends AbstractType
         $exportOptions = array(
             'compound' => true,
             'constraints' => array(
-                  //new \Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint()
-//                new Assert\Callback(array(
-//                    'callback' => function($data, ExecutionContextInterface $context, $payload) use ($export) {
-//                        dump('i call back');
-//                    }
-//                ))
+                  
             )
         );
         
         // add a contraint if required by export
-        /*if ($export instanceof ExportElementWithValidationInterface) {
-            dump('export instance of export element with validation');
-            $exportOptions = array_merge($exportOptions, array(
-                'constraints' => [new Assert\Callback([
-                    'callback' => function($data, ExecutionContextInterface $context, $payload) use ($export) {
-                        dump('i will execute callback');
-                        $export->validateForm($data[self::EXPORT_KEY], $context);
-                    }
-                ])],
-                'cascade_validation' => true
-            ));
-        } */;
         $exportBuilder = $builder->create(self::EXPORT_KEY/*, FormType::class, $exportOptions*/);
         
         $export->buildForm($exportBuilder);
diff --git a/Templating/TranslatableStringHelper.php b/Templating/TranslatableStringHelper.php
index 04d2f77a1..f6af9732a 100644
--- a/Templating/TranslatableStringHelper.php
+++ b/Templating/TranslatableStringHelper.php
@@ -78,8 +78,15 @@ class TranslatableStringHelper
             }
             
         }
+        
+        // no fallback translation... trying the  first available
+        $langs = array_keys($translatableStrings);
+        
+        if (count($langs) === 0) {
+            return '';
+        }
     
-        return '';
+        return $translatableStrings[$langs[0]];
 
     }
 
diff --git a/Tests/Search/AbstractSearchTest.php b/Tests/Search/AbstractSearchTest.php
index 50bfa6cc5..cce33dde5 100644
--- a/Tests/Search/AbstractSearchTest.php
+++ b/Tests/Search/AbstractSearchTest.php
@@ -40,7 +40,6 @@ class AbstractSearchTest extends \PHPUnit_Framework_TestCase
     public function testParseDateRegular()
     {
         
-        //var_dump($this->stub);
         $date = $this->stub->parseDate('2014-05-01');
 
         $this->assertEquals('2014', $date->format('Y'));