diff --git a/app/Lib/Export/TextExport.php b/app/Lib/Export/TextExport.php
index 366cb2a72..c4a495940 100644
--- a/app/Lib/Export/TextExport.php
+++ b/app/Lib/Export/TextExport.php
@@ -3,7 +3,8 @@
 class TextExport
 {
 	public $additional_params = array(
-		'flatten' => 1
+		'flatten' => 1,
+		'group' => 'Attribute.value'
 	);
 
 	public function handler($data, $options = array())
diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 02a7ad609..f5382051a 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -3439,7 +3439,7 @@ class Attribute extends AppModel
             $params['conditions']['AND']['(Attribute.deleted + 0)'] = $options['deleted'];
         }
         if (isset($options['group'])) {
-            $params['group'] = empty($options['group']) ? $options['group'] : false;
+            $params['group'] = !empty($options['group']) ? $options['group'] : false;
         }
         // Site admin can access even unpublished event attributes if `unpublishedprivate` option is enabled
         if (!$user['Role']['perm_site_admin'] && Configure::read('MISP.unpublishedprivate')) {
diff --git a/app/Model/MispObject.php b/app/Model/MispObject.php
index e8c2926ea..26a47ad77 100644
--- a/app/Model/MispObject.php
+++ b/app/Model/MispObject.php
@@ -361,7 +361,7 @@ class MispObject extends AppModel
         } else {
             foreach ($templateFields as $k => $v) {
                 if (!isset($object['Object'][$k])) {
-                    return 'No valid template found and object lacking template information. (' . $k . ')';
+                    return array('template' => array(__('No valid template found and object lacking template information. (%s)', $k)));
                 }
             }
         }
diff --git a/app/files/warninglists b/app/files/warninglists
index a80da878b..d4ca35c25 160000
--- a/app/files/warninglists
+++ b/app/files/warninglists
@@ -1 +1 @@
-Subproject commit a80da878b911e3633d88e576323e8cfec7f83e13
+Subproject commit d4ca35c25c7431f0696ab4b2289b2901b0c3f4c2