diff --git a/src/bin/termio.c b/src/bin/termio.c
index e8b424cb..1caaffc8 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -553,24 +553,31 @@ _smart_media_clicked(void *data, Evas_Object *obj, void *info __UNUSED__)
      {
         if (blk->link)
           {
+             int type = media_src_type_get(blk->link);
              Config *config = termio_config_get(data);
              
              if (config)
                {
-                  const char *cmd = NULL;
-                  
-                  file = blk->link;
-                  if ((config->helper.local.general) &&
-                      (config->helper.local.general[0]))
-                    cmd = config->helper.local.general;
-                  if (cmd)
+                  if ((!config->helper.inline_please) ||
+                      (!((type == TYPE_IMG) || (type == TYPE_SCALE) ||
+                         (type == TYPE_EDJE) || (type == TYPE_MOV))))
                     {
-                       char buf[PATH_MAX];
+                       const char *cmd = NULL;
                        
-                       snprintf(buf, sizeof(buf), "%s %s", cmd, file);
-                       ecore_exe_run(buf, NULL);
-                       return;
+                       file = blk->link;
+                       if ((config->helper.local.general) &&
+                           (config->helper.local.general[0]))
+                         cmd = config->helper.local.general;
+                       if (cmd)
+                         {
+                            char buf[PATH_MAX];
+                            
+                            snprintf(buf, sizeof(buf), "%s %s", cmd, file);
+                            ecore_exe_run(buf, NULL);
+                            return;
+                         }
                     }
+                  file = blk->link;
                }
           }
      }
diff --git a/src/bin/tyls.c b/src/bin/tyls.c
index de3935ab..5970ba38 100644
--- a/src/bin/tyls.c
+++ b/src/bin/tyls.c
@@ -345,12 +345,12 @@ const Cmatch fmatch[] =
    { 3, 4, 5,  9, 9, 9, "*.264", NULL},
    { 3, 4, 5,  9, 9, 9, "*.3gp", NULL},
    
-   { 2, 3, 5,  9, 9, 9, "*.mp3", NULL},
-   { 2, 3, 5,  9, 9, 9, "*.MP3", NULL},
-   { 2, 3, 5,  9, 9, 9, "*.aac", NULL},
-   { 2, 3, 5,  9, 9, 9, "*.AAC", NULL},
-   { 2, 3, 5,  9, 9, 9, "*.wav", NULL},
-   { 2, 3, 5,  9, 9, 9, "*.WAV", NULL},
+   { 2, 3, 5,  9, 9, 9, "*.mp3", "audio-x-mpeg.svg"},
+   { 2, 3, 5,  9, 9, 9, "*.MP3", "audio-x-mpeg.svg"},
+   { 2, 3, 5,  9, 9, 9, "*.aac", "audio-x-generic.svg"},
+   { 2, 3, 5,  9, 9, 9, "*.AAC", "audio-x-generic.svg"},
+   { 2, 3, 5,  9, 9, 9, "*.wav", "audio-x-wav.svg"},
+   { 2, 3, 5,  9, 9, 9, "*.WAV", "audio-x-wav.svg"},
    { 2, 3, 5,  9, 9, 9, "*.m3u", "audio-x-mp3-playlist"},
    { 2, 3, 5,  9, 9, 9, "*.M3U", "audio-x-mp3-playlist"},