diff --git a/auto_completion/bash_completion/winehelper b/auto_completion/bash_completion/winehelper
index 0da8e3f..74ce025 100644
--- a/auto_completion/bash_completion/winehelper
+++ b/auto_completion/bash_completion/winehelper
@@ -22,7 +22,7 @@ _winehelper_completions() {
             return 0
             ;;
         run|installed)
-            local installed=$(grep -h "Exec=env" ~/.local/share/winehelper/*.desktop 2>/dev/null | awk -F'/' '{print $NF}' | awk -F'"' '{print $1}')
+            local installed=$(ls -1 ~/.local/share/winehelper/ | grep ".desktop" | sed 's/.desktop//')
             COMPREPLY=( $(compgen -W "${installed}" -- "${cur}") )
             return 0
             ;;
diff --git a/auto_completion/zsh_completion/_winehelper b/auto_completion/zsh_completion/_winehelper
index d6831c8..f094e47 100644
--- a/auto_completion/zsh_completion/_winehelper
+++ b/auto_completion/zsh_completion/_winehelper
@@ -101,9 +101,7 @@ _get_list_for_install () {
 
 _get_installed_list () {
   installed=(
-    ${(f)"$(grep -h 'Exec=env' ~/.local/share/winehelper/*.desktop 2>/dev/null |
-    awk -F'/' '{print $NF}' |
-    awk -F'"' '{print $1}')"}
+    ${(f)"$(ls -1 ~/.local/share/winehelper/ | grep ".desktop" | sed 's/.desktop//')"}
   )
 
   if ((! ${#installed[@]} == 0 )); then
diff --git a/winehelper b/winehelper
index 55f8c68..1059d6e 100755
--- a/winehelper
+++ b/winehelper
@@ -592,7 +592,7 @@ check_installed_programs () {
                     print_info "Список установленных программ:"
                     check_installed_programs
                     exit 1
-                elif [[ "$EXE_PATH" =~ ${2}$ ]] ; then
+                elif [[ "$desktop_file" =~ ${2}.desktop ]] ; then
                     export EXE_PATH
                     return 0
                 fi
@@ -600,7 +600,8 @@ check_installed_programs () {
             *)
                 if [[ -f "$EXE_PATH.whdb" ]] ; then
                     WH_INFO_RU="$(grep "info_ru:" "$EXE_PATH.whdb" | awk -F"info_ru: " '{print $2}')"
-                    printf "\E[36m%s $SCRIPT_NAME run $(basename "$EXE_PATH") - $(basename "$desktop_file") %s\e[0m\n"
+                    WH_PROG_NAME="$(grep "PROG_NAME" "$EXE_PATH.whdb" | awk -F"=" '{print $2}')"
+                    printf "\E[36m%s $SCRIPT_NAME run $(basename "$desktop_file" .desktop) %s\e[0m- $WH_PROG_NAME\n"
                     echo -e "$WH_INFO_RU\n"
                 fi
             ;;
@@ -1626,7 +1627,7 @@ wh_info () {
     install [скрипт] --clear-pfx    не использовать готовый префикс для установки ПО
 
     installed                       список установленных программ
-    run [программа.exe]             запуск программы (отладка)
+    run [программа]                 запуск программы (отладка)
     remove-all                      удалить WineHelper и все связанные данные
     remove-prefix [имя_префикса]    удалить префикс и все связанные данные
     backup-prefix [имя_префикса]    создать резерную копию префикса