diff --git a/themes/3nids_theme/3nids/js/jquery.fancybox.js b/themes/3nids_theme/3nids/js/jquery.fancybox.js
index e2276598..a07c9cba 100755
--- a/themes/3nids_theme/3nids/js/jquery.fancybox.js
+++ b/themes/3nids_theme/3nids/js/jquery.fancybox.js
@@ -165,18 +165,12 @@
 		function _preload_neighbor_images() {
 			if ((opts.itemArray.length -1) > opts.itemCurrent) {
 				var href = opts.itemArray[opts.itemCurrent + 1].href;
-
-				if (href.match(imageRegExp)) {
-					$("<img>").attr("src", href);
-				}
+					$("<iframe>").attr("src", href);
 			}
 
 			if (opts.itemCurrent > 0) {
 				var href = opts.itemArray[opts.itemCurrent -1].href;
-
-				if (href.match(imageRegExp)) {
-					$("<img>").attr("src", href);
-				}
+					$("<iframe>").attr("src", href);
 			}
 		};
 
@@ -363,22 +357,23 @@
 				$('#fancy_modules').hide();
 				$('#fancy_title').hide();
 				var modules = opts.itemArray[ opts.itemCurrent ].modules;
-				var modtxt = '|';
+				var modtxt = '';
 				var pex = modules.search('exif::');
 				if (pex != -1){
 					var exifsrc = modules.substring(pex+6);
 					var exifsrc = exifsrc.split(';;',1);
-					modtxt += " <a href=\"" + exifsrc + "\" class=\"modclass\">EXIF</a> |";
+					modtxt += " <a href=\"" + exifsrc + "\" class=\"modclass\">EXIF</a>";
 				}
 				var pco = modules.search('comment::');
 				if (pco != -1){
+					if (modtxt != ''){modtxt += ' | ';}
 					var commentsrc = modules.substring(pco+9);
 					var commentsrc = commentsrc.split(';;',1);
 					var commentcount = modules.substring(modules.search('comment_count::')+15);
 					var commentcount = commentcount.split(';;',1);
-					modtxt += " <a href=\"" + commentsrc + "\" class=\"iframe modclass\">Comments (" + commentcount + ")</a> |";
+					modtxt += " <a href=\"" + commentsrc + "\" class=\"iframe modclass\">Comments (" + commentcount + ")</a>";
 				}
-				if (modtxt != '|'){
+				if (modtxt != ''){
 					$('#fancy_modules div').html(modtxt);
 					$('#fancy_modules').show();
 					$(document).ready(function() { $(".modclass").modbox(); });
diff --git a/themes/3nids_theme/last_commit.txt b/themes/3nids_theme/last_commit.txt
index 162d4147..dd0a18b8 100755
--- a/themes/3nids_theme/last_commit.txt
+++ b/themes/3nids_theme/last_commit.txt
@@ -1 +1 @@
-Added adim configuration for item description and image size.
\ No newline at end of file
+Fixed quotes probelems and remove | around "modules | exif"
\ No newline at end of file
diff --git a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap.php b/themes/3nids_theme/modules/tagsmap/helpers/tagsmap.php
new file mode 100755
index 00000000..6df4a016
--- /dev/null
+++ b/themes/3nids_theme/modules/tagsmap/helpers/tagsmap.php
@@ -0,0 +1,39 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+/**
+ * This is the API for handling comments.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class tagsmap_Core {
+
+	public function tagitems($tag) {
+		$tagitems = ORM::factory("item")
+			      ->viewable()
+			      ->join("items_tags", "items.id", "items_tags.item_id")
+			      ->where("items_tags.tag_id", $tag->tag_id)
+			      ->orderby("items.name", "DESC")
+			      ->find_all();
+		return $tagitems;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php b/themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php
index c6cc4ef7..d8673482 100755
--- a/themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php
+++ b/themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php
@@ -91,12 +91,7 @@ var map;
 	
 	<? //$tagitems = $oneGPS->tagitems(); ?>
 	<? $html_thumb = "<div id=\"g-map-div-$counter\" class=\"g-map-thumb-link\"></div><div class=\"g-map-thumb-img\"><table class=\"g-map-thumb-table\"><tr>"; 
-	$tagitems = ORM::factory("item")
-		      ->viewable()
-		      ->join("items_tags", "items.id", "items_tags.item_id")
-		      ->where("items_tags.tag_id", $oneGPS->tag_id)
-		      ->orderby("items.name", "DESC")
-		      ->find_all();
+	$tagitems = tagsmap::tagitems($oneGPS);
 	foreach ($tagitems as $tagchild){	
 	      $html_thumb .= "<td class=\"g-map-thumb-td\"><a href=\"" . $tagchild->url() . "\" onMouseOver=\"ThumbLink('g-map-div-$counter','" . html::purify($tagchild->title) . "')\" onMouseOut=\"ThumbLink('g-map-div-$counter','')\"><img src=\"" . $tagchild->thumb_url() . "\" class=\"gMapThumbnail\"></a></td>";
 		}
diff --git a/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php b/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php
index 005b6ea3..aa771794 100755
--- a/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php
+++ b/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php
@@ -45,9 +45,9 @@ class theme_3nids_Core {
 		if(count($tags) && $desriptionMode == "tags"){
 			$description =  " || " . implode(", ", $tags);
 		}elseif($desriptionMode == "item" && $item->description != ""){
-			$description = " || " . $item->description;
+			$description = " || " . str_replace("\"","&quot;",$item->description);
 		}elseif (($desriptionMode == "parent" || $desriptionMode == "item") && $item->parent()->description != ""){
-			$description = " || " . $item->parent()->description;
+			$description = " || " . str_replace("\"","&quot;",$item->parent()->description);
 		}
 		
 		$rel = "";