diff --git a/static/js/idDialog.js b/static/js/idDialog.js
index ba82d19f..e06f5bdd 100644
--- a/static/js/idDialog.js
+++ b/static/js/idDialog.js
@@ -97,7 +97,7 @@ pandora.ui.idDialog = function(data) {
                         labelWidth: 128,
                         value: Ox.decodeHTMLEntities(key == 'director' && data[key]
                             ? data[key].join(', ')
-                            : ('' + data[key])),
+                            : ('' + (data[key] || ''))),
                         width: formWidth
                     })
                     .css({display: 'inline-block', margin: '3px'})
diff --git a/static/js/importAnnotationsDialog.js b/static/js/importAnnotationsDialog.js
index 87593f15..559a8fa7 100644
--- a/static/js/importAnnotationsDialog.js
+++ b/static/js/importAnnotationsDialog.js
@@ -75,6 +75,7 @@ pandora.ui.importAnnotationsDialog = function(options) {
                     if (subtitlesLayer && format == 'srt' && Ox.getObjectById(layers, subtitlesLayer))  {
                         $layerSelect.options({value: subtitlesLayer})
                     }
+                    updateLanguageSelect();
                 }
                 that[
                     data.value.length ? 'enableButton' : 'disableButton'
diff --git a/static/js/infoView.js b/static/js/infoView.js
index e95d2682..6e68a95a 100644
--- a/static/js/infoView.js
+++ b/static/js/infoView.js
@@ -368,7 +368,7 @@ pandora.ui.infoView = function(data, isMixed) {
             .append(
                 Ox.EditableContent({
                         height: 128,
-                        placeholder: formatLight(Ox._(isMixed ? 'Mixed notes' : 'No notes')),
+                        placeholder: formatLight(Ox._(isMixed.notes ? 'Mixed notes' : 'No notes')),
                         tooltip: pandora.getEditTooltip(),
                         type: 'textarea',
                         value: data.notes || '',