diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index a74e42db..87f11b5c 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -333,7 +333,7 @@ function show_domains {
     for app_name in "${APPS_INSTALLED_NAMES[@]}"
     do
         icann_address=${DEFAULT_DOMAIN_NAME}
-        onion_address='-'
+        onion_address="-"
 
         # handle the foibles of capitalisation
         if ! grep -q "${app_name} domain" $COMPLETION_FILE; then
@@ -345,13 +345,13 @@ function show_domains {
                 if grep -q "${app_name_first_upper} domain" $COMPLETION_FILE; then
                     app_name=${app_name_first_upper}
                 else
-                    if [[ ${app_name] == "mumble" ]]; then
+                    if [[ ${app_name} == "mumble" ]]; then
                         app_name="VoIP"
                     fi
-                    if [[ ${app_name] == "gnusocial" ]]; then
+                    if [[ ${app_name} == "gnusocial" ]]; then
                         app_name="GNU Social"
                     fi
-                    if [[ ${app_name] == "searx" ]]; then
+                    if [[ ${app_name} == "searx" ]]; then
                         app_name="Search engine"
                     fi
                 fi
@@ -363,7 +363,7 @@ function show_domains {
         fi
 
         if grep -q "${app_name} onion domain" $COMPLETION_FILE; then
-            onion_address=$(cat ${COMPLETION_FILE} | grep "${app_name} onion domain" | awk -F ':' '{print $2}')
+            onion_address=$(cat ${COMPLETION_FILE} | grep "${app_name} onion domain" | head -n 1 | awk -F ':' '{print $2}')
         fi
 
         echo -n -e "$(pad_string '${app_name}')"