diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php
index cc65bb74..2faf3332 100644
--- a/src/admin/dialog/select_images.php
+++ b/src/admin/dialog/select_images.php
@@ -126,11 +126,15 @@ if (!empty($iseditor)) {
                         </div>";
                         echo "$line";
                     } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) {
-                        if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
-                        $reurl = preg_replace("#\.\.#", "", $reurl);
-                        $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+                        $reurl = preg_replace("#^\.\.#", "", $reurl);
+                        if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                           $reurl = $remoteupUrl.$reurl;
+                        } else {
+                            $reurl = $reurl;
+                        }
+                        if ($file == $comeback) $lstyle = "class='text-danger'";
+                        else  $lstyle = "";
                         $line = "<div class='list'>
                             <a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle>
                                 <img src='$reurl' title='$file'>
@@ -139,11 +143,15 @@ if (!empty($iseditor)) {
                         </div>";
                         echo "$line";
                     } else if (preg_match("#\.(jpg)#i", $file)) {
-                        if ($file == $comeback) $lstyle = "class='text-danger'";
-                        else  $lstyle = '';
                         $reurl = "$activeurl/$file";
-                        $reurl = preg_replace("#\.\.#", "", $reurl);
-                        $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+                        $reurl = preg_replace("#^\.\.#", "", $reurl);
+                        if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                           $reurl = $remoteupUrl.$reurl;
+                        } else {
+                            $reurl = $reurl;
+                        }
+                        if ($file == $comeback) $lstyle = "class='text-danger'";
+                        else  $lstyle = "";
                         $line = "<div class='list'>
                             <a href='$reurl' onclick=\"ReturnImg('$reurl');\" $lstyle>
                                 <img src='$reurl' title='$file'>
diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php
index fa5083d1..547f319b 100644
--- a/src/admin/dialog/select_media.php
+++ b/src/admin/dialog/select_media.php
@@ -115,11 +115,13 @@ if (!empty($noeditor)) {
                                     </tr>";
                                     echo "$line";
                                 } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) {
-                                    if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else  $lstyle = '';
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#\.\.#", "", $reurl);
-                                    $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                                       $reurl = $remoteupUrl.$reurl;
+                                    } else {
+                                        $reurl = $reurl;
+                                    }
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_flash.png'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -127,11 +129,13 @@ if (!empty($noeditor)) {
                                     </tr>";
                                     echo "$line";
                                 } else if (preg_match("#\.(wmv|avi)#i", $file)) {
-                                    if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else  $lstyle = '';
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#\.\.#", "", $reurl);
-                                    $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                                       $reurl = $remoteupUrl.$reurl;
+                                    } else {
+                                        $reurl = $reurl;
+                                    }
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_video.png'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -139,11 +143,13 @@ if (!empty($noeditor)) {
                                     </tr>";
                                     echo "$line";
                                 } else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) {
-                                    if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else  $lstyle = '';
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#\.\.#", "", $reurl);
-                                    $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                                       $reurl = $remoteupUrl.$reurl;
+                                    } else {
+                                        $reurl = $reurl;
+                                    }
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_rm.png'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -151,11 +157,13 @@ if (!empty($noeditor)) {
                                     </tr>";
                                     echo "$line";
                                 } else if (preg_match("#\.(mp3|wma)#", $file)) {
-                                    if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else  $lstyle = '';
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#\.\.#", "", $reurl);
-                                    $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
+                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                                       $reurl = $remoteupUrl.$reurl;
+                                    } else {
+                                        $reurl = $reurl;
+                                    }
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_music.png'> $file</a></td>
                                     <td>$filesize KB</td>
diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php
index 1d87aa85..87191525 100644
--- a/src/admin/dialog/select_soft.php
+++ b/src/admin/dialog/select_soft.php
@@ -117,8 +117,11 @@ if (!empty($noeditor)) {
                                 } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) {
                                     $reurl = "$activeurl/$file";
                                     $reurl = preg_replace("#^\.\.#", "", $reurl);
-                                    if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else $lstyle = "";
+                                    if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                                       $reurl = $remoteupUrl.$reurl;
+                                    } else {
+                                        $reurl = $reurl;
+                                    }
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_zip.png'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -128,8 +131,11 @@ if (!empty($noeditor)) {
                                 } else {
                                     $reurl = "$activeurl/$file";
                                     $reurl = preg_replace("#^\.\.#", "", $reurl);
-                                    if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else $lstyle = "";
+                                    if ($cfg_remote_site == 'Y' && $remoteuploads == 1) {
+                                       $reurl = $remoteupUrl.$reurl;
+                                    } else {
+                                        $reurl = $reurl;
+                                    }
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_exe.png'> $file</a></td>
                                     <td>$filesize KB</td>
diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php
index b0a328a4..82129546 100644
--- a/src/admin/dialog/select_templets.php
+++ b/src/admin/dialog/select_templets.php
@@ -106,9 +106,10 @@ if (empty($comeback)) {
                                     echo "$line";
                                 } else if (preg_match("#\.(htm|html)#i", $file)) {
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
                                     if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else $lstyle = "";
+                                    else  $lstyle = '';
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_htm.png'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -116,11 +117,11 @@ if (empty($comeback)) {
                                     </tr>";
                                     echo "$line";
                                 } else if (preg_match("#\.(css)#i", $file)) {
-                                    if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else  $lstyle = '';
                                     $reurl = "$activeurl/$file";
                                     $reurl = preg_replace("#\.\.#", "", $reurl);
                                     $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
+                                    if ($file == $comeback) $lstyle = "class='text-danger'";
+                                    else  $lstyle = '';
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_css.png'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -129,9 +130,10 @@ if (empty($comeback)) {
                                     echo "$line";
                                 } else if (preg_match("#\.(js)#i", $file)) {
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
                                     if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else $lstyle = "";
+                                    else  $lstyle = '';
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_js.png'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -140,9 +142,10 @@ if (empty($comeback)) {
                                     echo "$line";
                                 } else if (preg_match("#\.(jpg)#i", $file)) {
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
                                     if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else $lstyle = "";
+                                    else  $lstyle = '';
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -151,9 +154,10 @@ if (empty($comeback)) {
                                     echo "$line";
                                 } else if (preg_match("#\.(gif|png)#i", $file)) {
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
                                     if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else $lstyle = "";
+                                    else  $lstyle = '';
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='$reurl'> $file</a></td>
                                     <td>$filesize KB</td>
@@ -162,9 +166,10 @@ if (empty($comeback)) {
                                     echo "$line";
                                 } else if (preg_match("#\.(txt)#i", $file)) {
                                     $reurl = "$activeurl/$file";
-                                    $reurl = preg_replace("#^\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#\.\.#", "", $reurl);
+                                    $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
                                     if ($file == $comeback) $lstyle = "class='text-danger'";
-                                    else $lstyle = "";
+                                    else  $lstyle = '';
                                     $line = "<tr>
                                     <td><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='/static/web/img/icon_text.png'> $file</a></td>
                                     <td>$filesize KB</td>
diff --git a/src/user/content_list.php b/src/user/content_list.php
index 60f23711..2ef97604 100755
--- a/src/user/content_list.php
+++ b/src/user/content_list.php
@@ -42,7 +42,7 @@ if ($cid == 0) {
         $positionname = $row['typename'];
     }
 } else {
-    $positionname = str_replace($cfg_list_symbol, "", $tl->GetPositionName())." ";
+    $positionname = str_replace($cfg_list_symbol, " - ", $tl->GetPositionName())." ";
 }
 $whereSql = " where arc.channel = '$channelid' And arc.mid='$mid' ";
 if ($keyword != '') {