diff --git a/classes/GlossaryManager.php b/classes/GlossaryManager.php
index 7969a908a1..3b037a2f1f 100644
--- a/classes/GlossaryManager.php
+++ b/classes/GlossaryManager.php
@@ -62,11 +62,15 @@ public function getTermSearch($keyword, $language, $tid, $deepSearch = 1){
 			$sqlWhere .= ') ';
 		}
 		if($language) $sqlWhere .= 'AND (g.language = "'.$this->cleanInStr($language).'") ';
-		if($tid) $sqlWhere .= 'AND (t.tid = '.$tid.' OR t2.tid = '.$tid.') ';
+		if($tid) $sqlWhere .= 'AND (taxalink.tid = '.$tid.' OR taxalink2.tid = '.$tid.') ';
 		$sql = 'SELECT DISTINCT g.glossid, g.term, g.definition, tl.relationshipType, g2.glossid as glossid2, g2.term AS term2, g2.definition AS def2
 			FROM glossary g LEFT JOIN glossarytermlink tl ON g.glossid = tl.glossgrpid
 			LEFT JOIN glossary g2 ON tl.glossid = g2.glossid ';
-		if($tid) $sql .= 'INNER JOIN glossarytermlink tl ON g.glossid = tl.glossid INNER JOIN glossarytaxalink t ON tl.glossgrpid = t.glossid INNER JOIN glossarytaxalink t2 ON g.glossid = t2.glossid ';
+		if($tid){
+			$sql .= 'LEFT JOIN glossarytermlink termlink ON g.glossid = termlink.glossid
+				LEFT JOIN glossarytaxalink taxalink ON termlink.glossgrpid = taxalink.glossid
+				LEFT JOIN glossarytaxalink taxalink2 ON g.glossid = taxalink2.glossid ';
+		}
 		if($sqlWhere) $sql .= 'WHERE '.substr($sqlWhere, 3);
 		if($rs = $this->conn->query($sql)){
 			while($r = $rs->fetch_object()){
diff --git a/classes/ImageShared.php b/classes/ImageShared.php
index 4e74136dea..411e501cee 100644
--- a/classes/ImageShared.php
+++ b/classes/ImageShared.php
@@ -1081,6 +1081,7 @@ private static function getImgDim1($imgUrl) {
 						$block_size = hexdec($block_size[1]);
 						while(!feof($handle)) {
 							$i += $block_size;
+							if(!$block_size) return false;
 							$new_block .= fread($handle, $block_size);
 							if(isset($new_block[$i]) && $new_block[$i]=="\xFF") {
 								// New block detected, check for SOF marker
diff --git a/config/symbbase.php b/config/symbbase.php
index 3098049297..7fac978ab3 100644
--- a/config/symbbase.php
+++ b/config/symbbase.php
@@ -2,7 +2,7 @@
 header('X-Frame-Options: DENY');
 header('Cache-control: private'); // IE 6 FIX
 date_default_timezone_set('America/Phoenix');
-$CODE_VERSION = '3.0.31';
+$CODE_VERSION = '3.0.32';
 
 if(!isset($CLIENT_ROOT) && isset($clientRoot)) $CLIENT_ROOT = $clientRoot;
 if(substr($CLIENT_ROOT,-1) == '/') $CLIENT_ROOT = substr($CLIENT_ROOT,0,strlen($CLIENT_ROOT)-1);