diff --git a/bulkdata/Makefile b/bulkdata/Makefile
index 4d789e913..097e20d47 100755
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options b/bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options
index 2e9da0117..7809630e0 100644
--- a/bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options
+++ b/bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options
@@ -16,8 +16,8 @@ get_next_count()
 	fi
 
 	while [ "${found}" -ne 1 ]; do
-		uci -q get ${config}.${default_name}_${count} >/dev/null
-		if [ $? -eq 0 ]; then
+		uci -q get "${config}"."${default_name}"_${count} >/dev/null
+		if [ "$?" -eq 0 ]; then
 			count=$((count + 1))
 		else
 			found=1;
@@ -39,8 +39,8 @@ translate_profile_id_to_profile_name() {
 	
 	[ "${curr_profile_id}" != "${profile_id}" ] && return
 
-	uci -q set bulkdata.${section}.profile_name="${profile_name}"
-	uci -q set bulkdata.${section}.profile_id=""	
+	uci -q set bulkdata."${section}".profile_name="${profile_name}"
+	uci -q set bulkdata."${section}".profile_id=""
 }
 
 update_profile_sections() {
@@ -54,7 +54,7 @@ update_profile_sections() {
 
 	case "${section}" in
 		"cfg"*)
-			profile_name="$(get_next_count bulkdata ${default} ${PROFILE_COUNT})"
+			profile_name="$(get_next_count bulkdata "${default}" ${PROFILE_COUNT})"
 			uci_rename bulkdata "${section}" "${profile_name}"
 		;;
 	esac
@@ -62,7 +62,7 @@ update_profile_sections() {
 
 	[ -n "$profile_name" ] && section="${profile_name}"
 
-	uci -q set bulkdata.${section}.profile_id=""
+	uci -q set bulkdata."${section}".profile_id=""
 
 	config_foreach translate_profile_id_to_profile_name profile_parameter "${profile_id}" "${profile_name}"
 	config_foreach translate_profile_id_to_profile_name profile_http_request_uri_parameter "${profile_id}" "${profile_name}"