diff --git a/common/logging b/common/logging
index a48e01d..080eb63 100644
--- a/common/logging
+++ b/common/logging
@@ -34,6 +34,13 @@
 }
 
 
+FATAL_TRACK() {
+	echo -e "\n### $(date) ${FUNCNAME[1]}: FATAL error: $*" >&2
+	track end fatal $1 "'${@:2}'" none
+	print_stack
+	exit 1
+}
+
 FATAL() { 
 	echo -e "\n### $(date) ${FUNCNAME[1]}: FATAL error: $*" >&2
 	print_stack
diff --git a/common/track b/common/track
index 627c680..e5a5ef7 100644
--- a/common/track
+++ b/common/track
@@ -60,13 +60,14 @@
             operation="${1:-${osm_track_event_name}}"
             shift 1
             value="${1:-}"
+            value="${value// /_}"
             shift 1
             comment="${1:-}"
-            shift 1
             comment="${comment// /_}"
-            tags="${1:-}"
             shift 1
+            tags="${1:-}"
             tags="${tags//,/\~}"
+            shift 1
             [ "$value" == "none" ] && value=""
             [ "$comment" == "none" ] && comment=""
             [ "$tags" == "none" ] && tags=""