diff --git a/plugins/ktcore/KTColumns.inc.php b/plugins/ktcore/KTColumns.inc.php
index a513965..606686c 100644
--- a/plugins/ktcore/KTColumns.inc.php
+++ b/plugins/ktcore/KTColumns.inc.php
@@ -457,7 +457,7 @@ class AdvancedWorkflowColumn extends AdvancedColumn {
 
     function AdvancedWorkflowColumn() {
         $this->label = _kt("Workflow State");
-        $this->sortable = false;
+        $this->sortable = true;
     }
 
     // use inline, since its just too heavy to even _think_ about using smarty.
diff --git a/plugins/ktstandard/documentpreview/documentPreview.php b/plugins/ktstandard/documentpreview/documentPreview.php
index da58fa1..d270e63 100755
--- a/plugins/ktstandard/documentpreview/documentPreview.php
+++ b/plugins/ktstandard/documentpreview/documentPreview.php
@@ -311,7 +311,7 @@ class DocumentPreview {
             include_once(KT_DIR . '/plugins/thumbnails/thumbnails.php');
             $thumbnailer = new ThumbnailViewlet();
             $thumbnailer->setDocument($this->_oDocument);
-            $thumbnailDisplay = $thumbnailer->renderThumbnail($this->_IDocId);
+            $thumbnailDisplay = $thumbnailer->renderThumbnail($this->_IDocId, null, false);
             if ($thumbnailDisplay != '')
             {
         		$sInfo = "<div>$thumbnailDisplay</div>";
diff --git a/plugins/thumbnails/templates/thumbnail_viewlet.smarty b/plugins/thumbnails/templates/thumbnail_viewlet.smarty
index 41f6786..8540066 100755
--- a/plugins/thumbnails/templates/thumbnail_viewlet.smarty
+++ b/plugins/thumbnails/templates/thumbnail_viewlet.smarty
@@ -1,3 +1,4 @@
+{if $modal}
 {literal}
 <script type="text/javascript">
 	$(document).ready(function(){
@@ -5,6 +6,7 @@
 	});
 </script>
 {/literal}
+{/if}
 <div class="thumb-shadow">
     <div>
         {if $url && $modal}
diff --git a/plugins/thumbnails/thumbnails.php b/plugins/thumbnails/thumbnails.php
index 3e94927..26f5b01 100755
--- a/plugins/thumbnails/thumbnails.php
+++ b/plugins/thumbnails/thumbnails.php
@@ -242,7 +242,7 @@ class ThumbnailViewlet extends KTDocumentViewlet {
     	return $this->renderThumbnail($documentId);
     }
 
-    public function renderThumbnail($documentId, $height = null) {
+    public function renderThumbnail($documentId, $height = null, $modal = null) {
         // Set up the template
         $oKTTemplating =& KTTemplating::getSingleton();
         $oTemplate =& $oKTTemplating->loadTemplate('thumbnail_viewlet');
@@ -274,12 +274,11 @@ class ThumbnailViewlet extends KTDocumentViewlet {
 
 		// check for existence and status of the instant view plugin
 		$url = '';
-		$modal = '';
 		$title = '';
         if (KTPluginUtil::pluginIsActive('instaview.processor.plugin')) {
              require_once KTPluginUtil::getPluginPath('instaview.processor.plugin') . 'instaViewLinkAction.php';
              $ivLinkAction = new instaViewLinkAction();
-             $modal = $ivLinkAction->isImage($documentId);
+             if(is_null($modal)) $modal = $ivLinkAction->isImage($documentId);
              if($modal) { // If it requires a modal window, it only needs the document content
              	$url = $ivLinkAction->getViewLink($documentId, 'document_content');
              	$this->loadLightBox(); // Load lightbox effects