diff --git a/salt/elasticsearch/templates/so/so-common-template.json b/salt/elasticsearch/templates/so/so-common-template.json
index c1f0a6755..8adbdcf13 100644
--- a/salt/elasticsearch/templates/so/so-common-template.json
+++ b/salt/elasticsearch/templates/so/so-common-template.json
@@ -228,7 +228,11 @@
         "event":{
           "type":"object",
           "dynamic": true
-        }, 
+        },
+        "event_data":{
+          "type":"object",
+          "dynamic": true
+        },	
         "file":{
           "type":"object",
           "dynamic": true
diff --git a/setup/so-setup b/setup/so-setup
index d7dd3b660..f85cba628 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -291,7 +291,7 @@ if ! [[ -f $install_opt_file ]]; then
 		collect_hostname
 	fi
 
-	whiptail_node_description
+	[[ ! ( $is_eval || $is_import ) ]] && whiptail_node_description
 
 	if [[ $reinit_networking ]] || ! [[ -f $net_init_file ]]; then
 		network_init_whiptail
@@ -960,4 +960,4 @@ fi
 
 install_cleanup >> "$setup_log" 2>&1
 
-if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi
\ No newline at end of file
+if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi