diff --git a/bs_change_mime_type.php b/bs_change_mime_type.php
index c59fa181a..cb9599dda 100644
--- a/bs_change_mime_type.php
+++ b/bs_change_mime_type.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
     /**
      * @author      Raj Kissu Rajandran
      * @version     1.0
diff --git a/bs_play_media.php b/bs_play_media.php
index 9dadf50e6..cf80832ed 100644
--- a/bs_play_media.php
+++ b/bs_play_media.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
     /**
      * @author      Raj Kissu Rajandran
      * @version     1.0
diff --git a/js/functions.js b/js/functions.js
index 1ab4daeaf..baf7f8daf 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1244,12 +1244,13 @@ function pdfPaperSize(format, axis) {
  * rajk - for playing media from the BLOB repository
  *
  * @param   var     
+ * @param   var     url_params  main purpose is to pass the token 
  * @param   var     bs_ref      BLOB repository reference
  * @param   var     m_type      type of BLOB repository media
  * @param   var     w_width     width of popup window
  * @param   var     w_height    height of popup window
  */
-function popupBSMedia(bs_ref, m_type, w_width, w_height)
+function popupBSMedia(url_params, bs_ref, m_type, w_width, w_height)
 {
     // if width not specified, use default
     if (w_width == undefined)
@@ -1260,7 +1261,7 @@ function popupBSMedia(bs_ref, m_type, w_width, w_height)
         w_height = 480;
 
     // open popup window (for displaying video/playing audio)
-    var mediaWin = window.open('bs_play_media.php?bs_reference=' + bs_ref + '&media_type=' + m_type, 'viewBSMedia', 'width=' + w_width + ', height=' + w_height + ', resizable=1, scrollbars=1, status=0');
+    var mediaWin = window.open('bs_play_media.php?' + url_params + '&bs_reference=' + bs_ref + '&media_type=' + m_type, 'viewBSMedia', 'width=' + w_width + ', height=' + w_height + ', resizable=1, scrollbars=1, status=0');
 }
 
 /**
diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php
index bc4c20c88..29cc04df9 100644
--- a/libraries/blobstreaming.lib.php
+++ b/libraries/blobstreaming.lib.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @author	    Raj Kissu Rajandran
  * @version     1.0
@@ -27,12 +28,12 @@ function checkBLOBStreamingPlugins()
     if (empty($PMA_Config))
         return FALSE;
 
-    // retrieve default server configuration
+    // retrieve current server configuration
     $serverCfg = $PMA_Config->get('Servers');
-    $serverCfg = $serverCfg[$PMA_Config->settings['ServerDefault']];
+    $serverCfg = $serverCfg[$GLOBALS['server']];
 
-    // return if unable to retrieve default server configuration
-    if (!$serverCfg)
+    // return if unable to retrieve current server configuration
+    if (! $serverCfg)
         return FALSE;
 
     // if PHP extension in use is 'mysql', specify element 'PersistentConnections'
@@ -694,12 +695,12 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name)
                 break;
             // audio content
             case 'audio/mpeg':
-                $output .= ' (<a href="#" onclick="popupBSMedia(\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 120)">Play Audio</a>)';
+                $output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 120)">Play Audio</a>)';
                 break;
             // video content
             case 'application/x-flash-video':
             case 'video/mpeg':
-                $output .= ' (<a href="#" onclick="popupBSMedia(\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 480)">View Video</a>)';
+                $output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 480)">View Video</a>)';
                 break;
             // unsupported content. specify download
             default: