Index: units/helpers/language_import_helper.php
===================================================================
--- units/helpers/language_import_helper.php	(revision 13781)
+++ units/helpers/language_import_helper.php	(working copy)
@@ -263,7 +263,7 @@
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
-					WHERE ' . substr($module_sql, 0, -4) . ' AND ' . $limit_where . '
+					WHERE (' . substr($module_sql, 0, -4) . ') AND ' . $limit_where . '
 					ORDER BY `Event`, `Type`';
 			$events = $this->Conn->Query($sql, 'EventId');
 
Index: units/phrases/phrases_event_handler.php
===================================================================
--- units/phrases/phrases_event_handler.php	(revision 13756)
+++ units/phrases/phrases_event_handler.php	(working copy)
@@ -29,9 +29,10 @@
 		{
 			// don't call parent
 			if ($event->Special == 'import' || $event->Special == 'export') {
-				$object->setRequired('LangFile', true);
-				$object->setRequired('Phrase', false);
-				$object->setRequired('l' . $this->Application->GetVar('m_lang') . '_Translation', false);
+				$this->RemoveRequiredFields($object);
+				$object->setRequired('LangFile');
+				$object->setRequired('PhraseType');
+				$object->setRequired('Module');
 
 				// allow multiple phrase types to be selected during import/export
 				$field_options = $object->GetFieldOptions('PhraseType');