Index: pun_poll/manifest.xml
--- pun_poll/manifest.xml.orig	2011-03-05 15:22:36.000000000 +0100
+++ pun_poll/manifest.xml	2011-03-05 15:24:41.000000000 +0100
@@ -744,7 +744,7 @@
 								)
 							),
 							'WHERE'		=>	'a.topic_id='.$id,
-							'GROUP BY'	=>	'a.id',
+							'GROUP BY'	=>	'a.id, a.answer',
 							'ORDER BY'	=>	'a.id'
 						);
 						$result_pun_poll = $forum_db->query_build($query_pun_poll) or error(__FILE__, __LINE__);
Index: pun_tags/functions.php
--- pun_tags/functions.php.orig	2010-05-11 16:51:22.000000000 +0200
+++ pun_tags/functions.php	2011-03-05 15:24:41.000000000 +0100
@@ -128,10 +128,10 @@
 		'JOINS'		=> array(
 			array(
 				'LEFT JOIN'		=> 'topic_tags AS tt',
-				'ON'			=> 't.id = tt.tag_id GROUP BY t.id'
+				'ON'			=> 't.id = tt.tag_id GROUP BY t.id, t.tag'
 			)
 		),
-		'HAVING'	=> 'cnt = 0'
+		'HAVING'	=> 'COUNT(tt.tag_id) = 0'
 	);
 	$result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
 
Index: pun_tags/manifest.xml
--- pun_tags/manifest.xml.orig	2010-05-11 16:51:22.000000000 +0200
+++ pun_tags/manifest.xml	2011-03-05 15:24:41.000000000 +0100
@@ -66,7 +66,7 @@
 		$query_pun_tags = array(
 			'SELECT'	=>	'1',
 			'FROM'		=>	'config',
-			'WHERE'		=>	'conf_name = "o_pun_tags_show"'
+			'WHERE'		=>	'conf_name = \'o_pun_tags_show\''
 		);
 		$result_pun_tags = $forum_db->query_build($query_pun_tags) or error(__FILE__, __LINE__);
 		if ($forum_db->num_rows($result_pun_tags) == 0)
@@ -81,7 +81,7 @@
 		$query_pun_tags = array(
 			'SELECT'	=>	'1',
 			'FROM'		=>	'config',
-			'WHERE'		=>	'conf_name = "o_pun_tags_count_in_cloud"'
+			'WHERE'		=>	'conf_name = \'o_pun_tags_count_in_cloud\''
 		);
 		$result_pun_tags = $forum_db->query_build($query_pun_tags) or error(__FILE__, __LINE__);
 		if ($forum_db->num_rows($result_pun_tags) == 0)