diff --git a/services/ExportService.php b/services/ExportService.php
index 064dc5a..96b8b3b 100644
--- a/services/ExportService.php
+++ b/services/ExportService.php
@@ -449,6 +449,7 @@ public function parseFieldData($handle, $data)
                     case ExportModel::FieldTypeDropdown:
                         // Resolve to string
                         $data = (string) $data;
+                        $data = preg_replace('/\r|\n/', '', $data);
                         break;
 
                     case ExportModel::FieldTypeCheckboxes:
diff --git a/services/Export_UserService.php b/services/Export_UserService.php
index 99b0c0d..94cab93 100644
--- a/services/Export_UserService.php
+++ b/services/Export_UserService.php
@@ -116,7 +116,9 @@ public function setCriteria(array $settings)
         $criteria->status = isset($settings['map']['status']) ? $settings['map']['status'] : null;
 
         // Get by group
-        $criteria->groupId = $settings['elementvars']['groups'];
+        if (isset($settings['elementvars']) && isset($settings['elementvars']['groups'])) {
+            $criteria->groupId = $settings['elementvars']['groups'];
+        }
 
         return $criteria;
     }
diff --git a/templates/_map.twig b/templates/_map.twig
index 2b07a67..ee5416b 100644
--- a/templates/_map.twig
+++ b/templates/_map.twig
@@ -16,59 +16,62 @@
             <input type="hidden" name="export[{{ key }}]" value="{{ value }}">
         {% endfor %}
 
-        {% for key, value in export.elementvars %}
-            {% if value is iterable %}
-                {% for subvalue in value %}
-                    <input type="hidden" name="export[elementvars][{{ key }}][]" value="{{ subvalue }}">
-                {% endfor %}
-            {% else %}
-                <input type="hidden" name="export[elementvars][{{ key }}]" value="{{ value }}">
-            {% endif %}
-        {% endfor %}
+        {% if export.elementvars is defined %}
+            {% for key, value in export.elementvars %}
+                {% if value is iterable %}
+                    {% for subvalue in value %}
+                        <input type="hidden" name="export[elementvars][{{ key }}][]" value="{{ subvalue }}">
+                    {% endfor %}
+                {% else %}
+                    <input type="hidden" name="export[elementvars][{{ key }}]" value="{{ value }}">
+                {% endif %}
+            {% endfor %}
+        {% endif %}
 
         <p>{{ "Choose which fields you want to export."|t }}</p>
 
         <table class="data sortable">
             <tbody>
-    {% set fields = craft.export.getFields(export.type, reset) %}
-    {% for handle, data in fields %}
-        {% if data.fieldtype is defined %}
-            {% set customTableRow = craft.export.customTableRow(data.fieldtype) %}
-        {% else %}
-            {% set customTableRow = false %}
-        {% endif %}
-        {% if customTableRow %}
-            {% include customTableRow ignore missing %}
-        {% else %}
-            <tr>
-                <td>
-                    <div class="field">
-                        <div class="heading">
-                            <label>{{ data.name }}</label>
-                            <input type="hidden" name="fields[{{ handle }}][name]" value="{{ data.name }}">
-                            {% if data.entrytype is defined %}<input type="hidden" name="fields[{{ handle }}][entrytype]" value="{{ data.entrytype }}">{% endif %}
-                        </div>
-                    </div>
-                </td>
-                <td>
-                    <div class="field">
-                        <div class="heading">
-                            <label>{{ "as"|t }}</label>
-                            <input type="text" class="text" name="fields[{{ handle }}][label]" value="{{ data.label is defined ? data.label : data.name }}">
-                        </div>
-                    </div>
-                </td>
-                <td>
-                    {{ forms.checkboxField({
-                        label: 'Include in export'|t,
-                        instructions: "This value will be included in the export file."|t,
-                        name: "fields[" ~ handle ~ "][checked]",
-                        checked: data.checked
-                    }) }}
-                </td>
-            </tr>
-        {% endif %}
-    {% endfor %}
+                {% set fields = craft.export.getFields(export.type, reset) %}
+                {% for handle, data in fields %}
+                    {% if data.fieldtype is defined %}
+                        {% set customTableRow = craft.export.customTableRow(data.fieldtype) %}
+                    {% else %}
+                        {% set customTableRow = false %}
+                    {% endif %}
+                    
+                    {% if customTableRow %}
+                        {% include customTableRow ignore missing %}
+                    {% else %}
+                        <tr>
+                            <td>
+                                <div class="field">
+                                    <div class="heading">
+                                        <label>{{ data.name }}</label>
+                                        <input type="hidden" name="fields[{{ handle }}][name]" value="{{ data.name }}">
+                                        {% if data.entrytype is defined %}<input type="hidden" name="fields[{{ handle }}][entrytype]" value="{{ data.entrytype }}">{% endif %}
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="field">
+                                    <div class="heading">
+                                        <label>{{ "as"|t }}</label>
+                                        <input type="text" class="text" name="fields[{{ handle }}][label]" value="{{ data.label is defined ? data.label : data.name }}">
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                {{ forms.checkboxField({
+                                    label: 'Include in export'|t,
+                                    instructions: "This value will be included in the export file."|t,
+                                    name: "fields[" ~ handle ~ "][checked]",
+                                    checked: data.checked
+                                }) }}
+                            </td>
+                        </tr>
+                    {% endif %}
+                {% endfor %}
             </tbody>
             <tfoot>
                 <tr>