diff --git a/include/class.export.php b/include/class.export.php
index 521eb7cefbdb89605ebe87e04ea2d644f359d60c..1743d3f72d8a999b454c6efa536b44de33d0b6d2 100644
--- a/include/class.export.php
+++ b/include/class.export.php
@@ -53,10 +53,6 @@ class Export {
 
             $name = $f->get('name') ? $f->get('name') : 'field_'.$f->get('id');
             $key = '__field_'.$f->get('id');
-            // Fetch ID values for ID-based data
-            if ($f->hasIdValue()) {
-                $name .= '_id';
-            }
             $cdata[$key] = $f->get('label');
             $fields[$key] = $f;
             $select[] = "cdata.`$name` AS __field_".$f->get('id');
diff --git a/include/class.forms.php b/include/class.forms.php
index e242a44ba40c77807e454be6f9b2313cabc6bb5f..2ed396a1c2a06c39ff0b3635cc229362db129388 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -1205,7 +1205,10 @@ class PriorityField extends ChoiceField {
             reset($id);
             $id = key($id);
         }
-        return Priority::lookup($id);
+        elseif ($id === false)
+            $id = $value;
+        if ($id)
+            return Priority::lookup($id);
     }
 
     function to_database($prio) {