diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh
index 2b7717d64..8bd6df923 100755
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@@ -34,6 +34,7 @@ fn_info_message_backup
 if [ "${shortname}" != "jc2" ]&&[ "${shortname}" != "dst" ]&&[ "${shortname}" != "pz" ]&&[ "${engine}" != "renderware" ]; then
 	fn_info_message_commandlineparms
 fi
+fn_info_message_ports_edit
 fn_info_message_ports
 fn_info_message_select_engine
 fn_info_message_statusbottom
diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh
index 7df6dd1b7..fafb77b45 100755
--- a/lgsm/functions/command_dev_query_raw.sh
+++ b/lgsm/functions/command_dev_query_raw.sh
@@ -14,6 +14,7 @@ check.sh
 info_config.sh
 info_parms.sh
 info_distro.sh
+info_messages.sh
 
 echo -e ""
 echo -e "${lightgreen}Query IP Addresses${default}"
@@ -194,16 +195,7 @@ fi
 echo -e ""
 echo -e "${lightgreen}SS Output${default}"
 echo -e "================================="
-if [ "${shortname}" == "av" ]; then
-	echo -e "ss -tuplwn | grep AvorionServer"
-	echo -e ""
-	ss -tuplwn | grep AvorionServer
-else
-	executableshort="$(echo "${executable//.\/}" | cut -c -15)"
-	echo -e "ss -tuplwn | grep ${executableshort}"
-	echo -e ""
-	ss -tuplwn | grep ${executableshort}
-fi
+fn_info_message_ports
 echo -e ""
 echo -e "${lightgreen}Query Port - Raw Output${default}"
 echo -e "=================================================================="
diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh
index fa2907b1e..ff9ebbf14 100755
--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@@ -54,6 +54,7 @@ else
 		if [ "${shortname}" != "jc2" ]&&[ "${shortname}" != "jc3" ]&&[ "${shortname}" != "dst" ]&&[ "${shortname}" != "pz" ]&&[ "${engine}" != "renderware" ]; then
 			fn_info_message_commandlineparms
 		fi
+		fn_info_message_ports_edit
 		fn_info_message_ports
 		fn_info_message_select_engine
 		fn_info_message_statusbottom
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index 8d3cdef47..d8be0eebc 100755
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -637,7 +637,7 @@ fn_info_message_commandlineparms(){
 	echo -e "${preexecutable} ${executable} ${startparameters}"
 }
 
-fn_info_message_ports(){
+fn_info_message_ports_edit(){
 	#
 	# Ports
 	# =================================
@@ -669,6 +669,9 @@ fn_info_message_ports(){
 	done
 	echo -e "${startparameterslocation}"
 	echo -e ""
+}
+
+fn_info_message_ports(){
 	echo -e "${lightblue}Useful port diagnostic command:${default}"
 	if [ "${shortname}" == "av" ]; then
 		echo -e "ss -tuplwn | grep AvorionServer"