diff --git a/check-piano.sh b/check-piano.sh
index 238202b..78e7707 100755
--- a/check-piano.sh
+++ b/check-piano.sh
@@ -16,7 +16,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 1.1.0
+#-    version         ${SCRIPT_NAME} 1.1.1
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -117,7 +117,7 @@ while getopts ${SCRIPT_OPTS} OPTION ; do
 	# Translate long options to short
 	if [[ "x$OPTION" == "x-" ]]; then
 		LONG_OPTION=$OPTARG
-		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2)
+		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
 		LONG_OPTIND=-1
 		[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
 		[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"
diff --git a/edit-desktop.sh b/edit-desktop.sh
index e51e302..0ccee71 100755
--- a/edit-desktop.sh
+++ b/edit-desktop.sh
@@ -16,7 +16,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 1.1.5
+#-    version         ${SCRIPT_NAME} 1.1.6
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -114,7 +114,7 @@ while getopts ${SCRIPT_OPTS} OPTION ; do
 	# Translate long options to short
 	if [[ "x$OPTION" == "x-" ]]; then
 		LONG_OPTION=$OPTARG
-		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2)
+		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
 		LONG_OPTIND=-1
 		[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
 		[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"
diff --git a/fsq_search.sh b/fsq_search.sh
index a6daa2c..db51d31 100755
--- a/fsq_search.sh
+++ b/fsq_search.sh
@@ -78,7 +78,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 1.2.5
+#-    version         ${SCRIPT_NAME} 1.2.6
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -203,6 +203,8 @@ ARRAY_OPTS=(
 	[wait]=w
 )
 
+LONG_OPTS="^($(echo "${!ARRAY_OPTS[@]}" | tr ' ' '|'))="
+
 # Parse options
 while getopts ${SCRIPT_OPTS} OPTION
 do
@@ -210,16 +212,16 @@ do
 	if [[ "x$OPTION" == "x-" ]]
 	then
 		LONG_OPTION=$OPTARG
-		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
+		LONG_OPTARG=$(echo $LONG_OPTION | egrep "$LONG_OPTS" | cut -d'=' -f2-)
 		LONG_OPTIND=-1
-		[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
+		[[ "x$LONG_OPTARG" == "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
 		[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"
 		OPTION=${ARRAY_OPTS[$LONG_OPTION]}
-		[[ "x$OPTION" = "x" ]] &&  OPTION="?" OPTARG="-$LONG_OPTION"
+		[[ "x$OPTION" == "x" ]] &&  OPTION="?" OPTARG="-$LONG_OPTION"
 		
 		if [[ $( echo "${SCRIPT_OPTS}" | grep -c "${OPTION}:" ) -eq 1 ]]
 		then
-			if [[ "x${LONG_OPTARG}" = "x" ]] || [[ "${LONG_OPTARG}" = -* ]]
+			if [[ "x${LONG_OPTARG}" == "x" ]] || [[ "${LONG_OPTARG}" == -* ]]
 			then 
 				OPTION=":" OPTARG="-$LONG_OPTION"
 			else
@@ -233,6 +235,7 @@ do
 			fi
 		fi
 	fi
+	#echo "OPTION=\"$OPTION\" OPTARG=\"$OPTARG\"  LONG_OPTION=\"$LONG_OPTION\"  LONG_OPTARG=\"$LONG_OPTARG\""
 
 	# Options followed by another option instead of argument
 	if [[ "x${OPTION}" != "x:" ]] && [[ "x${OPTION}" != "x?" ]] && [[ "${OPTARG}" = -* ]]
diff --git a/hampi-utilities.version b/hampi-utilities.version
index 44944f6..9dfcbaf 100644
--- a/hampi-utilities.version
+++ b/hampi-utilities.version
@@ -1 +1 @@
-VERSION="2.1.10"
\ No newline at end of file
+VERSION="2.1.11"
\ No newline at end of file
diff --git a/name-radios.sh b/name-radios.sh
index 3874dc7..525fc5c 100755
--- a/name-radios.sh
+++ b/name-radios.sh
@@ -15,7 +15,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 1.3.2
+#-    version         ${SCRIPT_NAME} 1.3.3
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -110,7 +110,7 @@ while getopts ${SCRIPT_OPTS} OPTION ; do
 	# Translate long options to short
 	if [[ "x$OPTION" == "x-" ]]; then
 		LONG_OPTION=$OPTARG
-		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2)
+		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
 		LONG_OPTIND=-1
 		[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
 		[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"
diff --git a/patmail.sh b/patmail.sh
index e17516b..f1bc0a6 100755
--- a/patmail.sh
+++ b/patmail.sh
@@ -63,7 +63,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 2.2.4
+#-    version         ${SCRIPT_NAME} 2.2.5
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
diff --git a/tnc.sh b/tnc.sh
index 3ea645f..a2720c6 100755
--- a/tnc.sh
+++ b/tnc.sh
@@ -97,7 +97,7 @@
 #%
 #================================================================
 #- IMPLEMENTATION
-#-    version         ${SCRIPT_NAME} 3.3.6
+#-    version         ${SCRIPT_NAME} 3.3.7
 #-    author          Steve Magnuson, AG7GN
 #-    license         CC-BY-SA Creative Commons License
 #-    script_id       0
@@ -405,7 +405,7 @@ do
 	if [[ "x$OPTION" == "x-" ]]
 	then
 		LONG_OPTION=$OPTARG
-		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2)
+		LONG_OPTARG=$(echo $LONG_OPTION | grep "=" | cut -d'=' -f2-)
 		LONG_OPTIND=-1
 		[[ "x$LONG_OPTARG" = "x" ]] && LONG_OPTIND=$OPTIND || LONG_OPTION=$(echo $OPTARG | cut -d'=' -f1)
 		[[ $LONG_OPTIND -ne -1 ]] && eval LONG_OPTARG="\$$LONG_OPTIND"