diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index 7b1aa64b2..0cb16205d 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -33,7 +33,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             "rating" => "Rating",
             "sample_rate" => "Sample Rate",
             "track_title" => "Title",
-            "track_num" => "Track Number",
+            "track_number" => "Track Number",
             "utime" => "Uploaded",
             "year" => "Year"               
         );
@@ -64,7 +64,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             "rating" => "n",
             "sample_rate" => "n",
             "track_title" => "s",
-            "track_num" => "n",
+            "track_number" => "n",
             "year" => "n"
         );
         
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index e0cfecef5..1d9163957 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -76,11 +76,11 @@ class Application_Model_Block
             "mood" => "DbMood",
             "name" => "DbName",
             "orchestra" => "DbOrchestra",
-            "radio_station_name" => "DbRadioStation",
+            "radio_station_name" => "DbRadioStationName",
             "rating" => "DbRating",
             "sample_rate" => "DbSampleRate",
             "track_title" => "DbTrackTitle",
-            "track_num" => "DbTrackNum",
+            "track_number" => "DbTrackNumber",
             "year" => "DbYear"
     );
     
@@ -1169,7 +1169,7 @@ EOT;
                 "rating" => "Rating",
                 "sample_rate" => "Sample Rate",
                 "track_title" => "Title",
-                "track_num" => "Track Number",
+                "track_number" => "Track Number",
                 "utime" => "Uploaded",
                 "year" => "Year"
         );
diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
index 31f1c7f0c..3579b1d7c 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
@@ -102,9 +102,9 @@
                 if (strlen($crit["value"]) > $valMaxStrLen) {
                     $crit["value"] = substr($crit["value"], 0, 24)."...";
                 }
-                $critMaxStrLen = 11;
-                if (strlen($crit["display_name"] > $critMaxStrLen)) {
-                    $crit["display_name"] = substr($crit["display_name"], 0, 10)."...";
+                $critMaxStrLen = 13;
+                if (strlen($crit["display_name"]) > $critMaxStrLen) {
+                    $crit["display_name"] = substr($crit["display_name"], 0, 12)."...";
                 }
                 ?>
                 <tr>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 73f0d1c5f..55c8ad23c 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -443,7 +443,7 @@ table.library-get-file-md.table-small{
 }    
 
 .file-md-qtip-criteria-width-crit{
-    width:60px;
+    width:70px;
 }
 
 .file-md-qtip-criteria-width-mod{
@@ -451,7 +451,7 @@ table.library-get-file-md.table-small{
 }
 
 .file-md-qtip-criteria-width{
-    width:120px;
+    width:110px;
 }
 
 .file-md-qtip-row-width-title{