diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index 90a7e3fd..5e8d1b22 100644
Binary files a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo and b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index 161d34d7..8be6bc87 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-04-24 18:05+0100\n"
-"PO-Revision-Date: 2014-04-24 18:06+0100\n"
+"POT-Creation-Date: 2014-04-25 02:24+0100\n"
+"PO-Revision-Date: 2014-04-25 02:26+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -121,7 +121,7 @@ msgstr "Fehler"
 
 #: views/html/achievements/index.tpl:9 views/html/seminarymenu/index.tpl:4
 msgid "Achievements"
-msgstr "Errungenschaften"
+msgstr "Achievements"
 
 #: views/html/achievements/index.tpl:10
 msgid "Achievement description"
@@ -215,16 +215,11 @@ msgid "Characters"
 msgstr "Charaktere"
 
 #: views/html/charactergroups/group.tpl:45
-#: views/html/charactergroups/managegroup.tpl:54
-#: views/html/questgroups/questgroup.tpl:57 views/html/quests/create.tpl:9
-#: views/html/quests/index.tpl:9
-msgid "Quests"
-msgstr "Quests"
-
 #: views/html/charactergroups/groupsgroup.tpl:20
 #: views/html/charactergroupsquests/quest.tpl:9
-msgid "Character Groups Quests"
-msgstr "Gruppenquests"
+#, php-format
+msgid "%s-Quests"
+msgstr "%squests"
 
 #: views/html/charactergroups/managegroup.tpl:40
 msgid "Remove Characters"
@@ -238,6 +233,12 @@ msgstr "Filtere Charaktere"
 msgid "Add Characters"
 msgstr "Füge Charaktere hinzu"
 
+#: views/html/charactergroups/managegroup.tpl:54
+#: views/html/questgroups/questgroup.tpl:57 views/html/quests/create.tpl:9
+#: views/html/quests/index.tpl:9
+msgid "Quests"
+msgstr "Quests"
+
 #: views/html/charactergroupsquests/quest.tpl:16
 msgid "Description"
 msgstr "Beschreibung"
@@ -743,6 +744,13 @@ msgstr "Registrieren"
 msgid "Roles"
 msgstr "Rollen"
 
+#, fuzzy
+#~ msgid "%stQuests"
+#~ msgstr "Quests"
+
+#~ msgid "Character Groups Quests"
+#~ msgstr "Gruppenquests"
+
 #~ msgid "Skip task"
 #~ msgstr "Aufgabe überspringen"
 
diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc
index eb7c1531..329a7403 100644
--- a/models/CharactersModel.inc
+++ b/models/CharactersModel.inc
@@ -186,15 +186,18 @@
 			return $this->db->query(
 				'SELECT characters.id, characters.created, characters.charactertype_id, characters.name, characters.url, characters.user_id, characters.xps, characters.xplevel, characters.avatar_id, charactertypes.name AS charactertype_name, charactertypes.url AS charactertype_url, count(DISTINCT achievement_id) AS c '.
 				'FROM achievements_characters '.
-				'LEFT JOIN achievements ON achievements.id = achievements_characters.achievement_id '.
-				'LEFT JOIN v_characters AS characters ON characters.id = achievements_characters.character_id '.
-				'LEFT JOIN charactertypes ON charactertypes.id = characters.charactertype_id '.
+				'INNER JOIN achievements ON achievements.id = achievements_characters.achievement_id '.
+				'INNER JOIN v_characters AS characters ON characters.id = achievements_characters.character_id '.
+				'INNER JOIN characters_characterroles ON characters_characterroles.character_id = characters.id '.
+				'INNER JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id AND characterroles.name = ? '.
+				'INNER JOIN charactertypes ON charactertypes.id = characters.charactertype_id '.
 				'WHERE achievements.seminary_id = ? AND deadline IS NULL '.
 				(!$alsoWithDeadline ? 'AND achievements.deadline IS NULL ' : null).
-				'GROUP BY character_id '.
-				'ORDER BY count(DISTINCT achievement_id) DESC '.
+				'GROUP BY achievements_characters.character_id '.
+				'ORDER BY count(DISTINCT achievements_characters.achievement_id) DESC '.
 				'LIMIT ?',
-				'ii',
+				'sii',
+				'user',
 				$seminaryId,
 				$count
 			);
diff --git a/views/html/charactergroups/group.tpl b/views/html/charactergroups/group.tpl
index 5b5e1f4c..5ef03248 100644
--- a/views/html/charactergroups/group.tpl
+++ b/views/html/charactergroups/group.tpl
@@ -42,7 +42,7 @@
 </section>
 
 <section>
-	<h1><i class="fa fa-pencil-square-o fa-fw"></i><?=_('Quests')?></h1>
+	<h1><i class="fa fa-pencil-square-o fa-fw"></i><?=sprintf(_('%s-Quests'),$groupsgroup['name'])?></h1>
 	<ul class="gquests">
 		<?php foreach($quests as &$quest) : ?>
 		<li class="cf">
diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl
index 3d337cf3..daa1c973 100644
--- a/views/html/charactergroups/groupsgroup.tpl
+++ b/views/html/charactergroups/groupsgroup.tpl
@@ -17,7 +17,7 @@
 </ol>
 
 
-<h2><?=_('Character Groups Quests')?></h2>
+<h2><?=sprintf(_('%s-Quests'),$groupsgroup['name'])?></h2>
 <ul class="cgqlist">
 	<?php foreach($quests as &$quest) : ?>
 	<li><a href="<?=$linker->link(array('charactergroupsquests','quest',$seminary['url'],$groupsgroup['url'],$quest['url']))?>"><?=$quest['title']?></a></li>
diff --git a/views/html/charactergroupsquests/quest.tpl b/views/html/charactergroupsquests/quest.tpl
index 6c696737..45267e1a 100644
--- a/views/html/charactergroupsquests/quest.tpl
+++ b/views/html/charactergroupsquests/quest.tpl
@@ -5,8 +5,8 @@
 <?php endif ?>
 <ul class="breadcrumbs">
 	<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
+	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('charactergroups','index',$seminary['url']))?>"><?=_('Character Groups')?></a></li>
 	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('charactergroups','groupsgroup',$seminary['url'],$groupsgroup['url']))?>"><?=$groupsgroup['name']?></a></li>
-	<li><i class="fa fa-chevron-right fa-fw"></i><?=_('Character Groups Quests')?></li>
 </ul>
 
 <h1><?=$quest['title']?></h1>