diff --git a/eagle-assembly/src/main/bin/eagle-topology-init.sh b/eagle-assembly/src/main/bin/eagle-topology-init.sh
index dc9dd59..a8035ed 100755
--- a/eagle-assembly/src/main/bin/eagle-topology-init.sh
+++ b/eagle-assembly/src/main/bin/eagle-topology-init.sh
@@ -25,7 +25,7 @@
 
 ## AlertDataSource: data sources bound to sites
 
-echo "Begin to initialize HBase tables ..."
+echo "Begin to initialize metadata for eagle topologies ..."
 
 echo ""
 echo "Importing sample site ..."
diff --git a/eagle-webservice/src/main/webapp/app/public/js/common.js b/eagle-webservice/src/main/webapp/app/public/js/common.js
index 4c5e82f..f94b58f 100644
--- a/eagle-webservice/src/main/webapp/app/public/js/common.js
+++ b/eagle-webservice/src/main/webapp/app/public/js/common.js
@@ -176,7 +176,7 @@
 
 common.properties.check = function (str) {
 	var pass = true;
-	var regex = /^\s*[\w\.]+\s*=(.*)$/;
+	var regex = /^\s*[\w\.-]+\s*=(.*)$/;
 	$.each((str || "").trim().split(/[\r\n\s]+/g), function (i, line) {
 		if(!regex.test(line)) {
 			pass = false;