diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index a553f93b5..953c53e7b 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -107,21 +107,18 @@ class ApiController extends Zend_Controller_Action
 
         $api_key = $this->_getParam('api_key');
 
-
-        $logger = Logging::getLogger();
-
         if(!in_array($api_key, $CC_CONFIG["apiKey"]) &&
             is_null(Zend_Auth::getInstance()->getStorage()->read()))
         {
             header('HTTP/1.0 401 Unauthorized');
             print 'You are not allowed to access this resource.';
-            $logger->info("401 Unauthorized");
+            Logging::log("401 Unauthorized");
             return;
         }
-
-        $fileID = $this->_getParam("fileID");
+        
+        $fileID = $this->_getParam("file");
         $file_id = substr($fileID, 0, strpos($fileID, "."));
-
+        
         if (ctype_alnum($file_id) && strlen($file_id) == 32)
         {
             $media = Application_Model_StoredFile::RecallByGunid($file_id);
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 6a9a8e2e0..107c23d53 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -87,6 +87,13 @@ class Application_Form_EditAudioMD extends Zend_Form
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
+        
+        // Add conductor field
+        $this->addElement('text', 'conductor', array(
+            'label'      => 'Conductor:',
+            'class'      => 'input_text',
+            'filters'    => array('StringTrim')
+        ));
 
 		// Add mood field
         $this->addElement('text', 'mood', array(
diff --git a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
index 77fcdf933..4e0caf69d 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
@@ -1,6 +1,6 @@
 <?php if($this->type == "audioclip") : ?>
 <div><span>Title:</span><span><?php echo ($this->md["MDATA_KEY_TITLE"]);?></span></div>
-<div><span>Artist:</span><span><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></span></div>
+<div><span>Creator:</span><span><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></span></div>
 <div><span>Album:</span><span><?php echo ($this->md["MDATA_KEY_SOURCE"]);?></span></div>
 <div><span>Track:</span><span><?php echo ($this->md["MDATA_KEY_TRACKNUMBER"]);?></span></div>
 <div><span>Length:</span><span><?php echo ($this->md["MDATA_KEY_DURATION"]);?></span></div>
@@ -11,6 +11,7 @@
 <div><span>Year:</span><span><?php echo ($this->md["MDATA_KEY_YEAR"]);?></span></div>
 <div><span>Label:</span><span><?php echo ($this->md["MDATA_KEY_LABEL"]);?></span></div>
 <div><span>BPM:</span><span><?php echo ($this->md["MDATA_KEY_BPM"]);?></span></div>
+<div><span>Composer:</span><span><?php echo ($this->md["MDATA_KEY_COMPOSER"]);?></span></div>
 <div><span>Conductor:</span><span><?php echo ($this->md["MDATA_KEY_CONDUCTOR"]);?></span></div>
 <div><span>Copyright:</span><span><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></span></div>
 <div><span>Isrc Number:</span><span><?php echo ($this->md["MDATA_KEY_ISRC"]);?></span></div>
diff --git a/airtime_mvc/public/js/jplayer/preview_jplayer.js b/airtime_mvc/public/js/jplayer/preview_jplayer.js
index f00a92b7b..5eacef33f 100644
--- a/airtime_mvc/public/js/jplayer/preview_jplayer.js
+++ b/airtime_mvc/public/js/jplayer/preview_jplayer.js
@@ -92,12 +92,12 @@ function buildplaylist(p_url, p_playIndex) {
             if (data[index]['element_mp3'] != undefined){
                 media = {title: data[index]['element_title'],
                         artist: data[index]['element_artist'],
-                        mp3:"/api/get-media/fileID/"+data[index]['element_mp3']
+                        mp3:"/api/get-media/file/"+data[index]['element_mp3']
                 };
             }else if (data[index]['element_oga'] != undefined) {
                 media = {title: data[index]['element_title'],
                         artist: data[index]['element_artist'],
-                        oga:"/api/get-media/fileID/"+data[index]['element_oga']
+                        oga:"/api/get-media/file/"+data[index]['element_oga']
                 };
             }
             myPlaylist[index] = media;
@@ -132,12 +132,12 @@ function playOne(p_audioFileID) {
     if (fileExtensioin === 'mp3') {
         media = {title: $('.audioFileTitle').text() !== 'null' ?$('.audioFileTitle').text():"",
             artist: $('.audioFileArtist').text() !== 'null' ?$('.audioFileArtist').text():"",
-            mp3:"/api/get-media/fileID/"+p_audioFileID
+            mp3:"/api/get-media/file/"+p_audioFileID
         };
     }else if (fileExtensioin === 'ogg' ) {
         media = {title: $('.audioFileTitle').text() != 'null' ?$('.audioFileTitle').text():"",
             artist: $('.audioFileArtist').text() != 'null' ?$('.audioFileArtist').text():"",
-            oga:"/api/get-media/fileID/"+p_audioFileID
+            oga:"/api/get-media/file/"+p_audioFileID
         };
     }
     _playlist_jplayer.option("autoPlay", true);