diff --git a/db/migrations/5.1.52_fix_for_biest3366.php b/db/migrations/5.1.52_fix_for_biest3366.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ff333b66099fb3910e596144082c81c352f9e90
--- /dev/null
+++ b/db/migrations/5.1.52_fix_for_biest3366.php
@@ -0,0 +1,26 @@
+<?php
+
+class FixForBiest3366 extends Migration
+{
+    public function description()
+    {
+        return 'Removes the database table "globalsearch_buzzwords"';
+    }
+
+    public function up()
+    {
+        DBManager::get()->exec('DROP TABLE `globalsearch_buzzwords`');
+    }
+
+    public function down()
+    {
+        DBManager::get()->exec("CREATE TABLE `globalsearch_buzzwords` (
+            `id` CHAR(32) COLLATE latin1_bin NOT NULL,
+            `rights` ENUM('user','autor','tutor','dozent','admin','root') NOT NULL DEFAULT 'user',
+            `name` varchar(255) NOT NULL DEFAULT '',
+            `buzzwords` varchar(2048) NOT NULL DEFAULT '',
+            `subtitle` varchar(255) DEFAULT NULL,
+            `url` varchar(2048) NOT NULL DEFAULT '',
+            PRIMARY KEY (`id`))");
+    }
+}
diff --git a/lib/classes/globalsearch/GlobalSearchBuzzwords.php b/lib/classes/globalsearch/GlobalSearchBuzzwords.php
deleted file mode 100644
index fb9294a52df000f9b83072c189dee6ef9dff7342..0000000000000000000000000000000000000000
--- a/lib/classes/globalsearch/GlobalSearchBuzzwords.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * GlobalSearchModule for buzzwords: words that trigger some manual info,
- * e.g. links to Campus systems etc.
- *
- * @author      Thomas Hackl <thomas.hackl@uni-passau.de>
- * @license     http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- * @category    Stud.IP
- * @since       4.1
- */
-class GlobalSearchBuzzwords extends SimpleORMap
-{
-
-    /**
-     * SimpleORMap metadata.
-     * @param array $config configuration for SORM.
-     */
-    protected static function configure($config = [])
-    {
-        $config['db_table'] = 'globalsearch_buzzwords';
-        $config['additional_fields']['rightsname'] = true;
-        parent::configure($config);
-    }
-
-    /**
-     * Gets the Stud.IP name for a given permission level.
-     * @return false|int|string
-     */
-    public function getRightsname()
-    {
-        return array_search($this->rights, $GLOBALS['perm']->permissions);
-    }
-
-    /**
-     * Returns the displayname for this module
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return _('Stichwörter');
-    }
-
-    /**
-     * Transforms the search request into an sql statement, that provides the id (same as getId) as type and
-     * the object id, that is later passed to the filter.
-     *
-     * This function is required to make use of the mysql union parallelism
-     *
-     * @param string $search the input query string
-     * @return String SQL Query to discover elements for the search
-     */
-    public static function getSQL($search, $filter, $limit)
-    {
-        if (!$search) {
-            return null;
-        }
-
-        $query = DBManager::get()->quote("%{$search}%");
-        $rights = $GLOBALS['perm']->permissions[$GLOBALS['perm']->get_perm()];
-
-        return "SELECT SQL_CALC_FOUND_ROWS *
-                FROM `globalsearch_buzzwords`
-                WHERE `buzzwords` LIKE {$query}
-                  AND {$rights} >= rights";
-    }
-
-    /**
-     * Returns an array of information for the found element. Following information (key: description) is necessary
-     *
-     * - name: The name of the object
-     * - url: The url to send the user to when he clicks the link
-     *
-     * Additional informations are:
-     *
-     * - additional: Subtitle for the hit
-     * - expand: Url if the user further expands the search
-     * - img: Avatar for the
-     *
-     * @param array $buzz
-     * @param string $search
-     * @return array
-     */
-    public static function filter($buzz, $search)
-    {
-        return [
-            'name'       => htmlReady($buzz['name']),
-            'url'        => $buzz['url'],
-            'additional' => $buzz['subtitle']
-        ];
-    }
-}
diff --git a/lib/classes/globalsearch/GlobalSearchCourses.php b/lib/classes/globalsearch/GlobalSearchCourses.php
index ed124da320861759a4d7afdf62df8a03d60a3832..3725484aef851f9b16059785c8bda6a344bff627 100644
--- a/lib/classes/globalsearch/GlobalSearchCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchCourses.php
@@ -216,7 +216,7 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull
             'number'        => self::mark($course->veranstaltungsnummer, $search),
             'name'          => self::mark($course->getFullname(), $search),
             'url'           => URLHelper::getURL("dispatch.php/course/details/index/{$course->id}", [], true),
-            'date'          => $semester->short_name,
+            'date'          => htmlReady($semester->short_name),
             'dates'         => $turnus_string,
             'has_children'  => count($course->children) > 0,
             'children'      => $result_children,
diff --git a/lib/classes/globalsearch/GlobalSearchModules.php b/lib/classes/globalsearch/GlobalSearchModules.php
index 66d531787948a18755ba8a4fe80d4c9c1d55a9a1..b9f872011409a4f13194d0488549b68783b7bc2f 100644
--- a/lib/classes/globalsearch/GlobalSearchModules.php
+++ b/lib/classes/globalsearch/GlobalSearchModules.php
@@ -141,7 +141,7 @@ class GlobalSearchModules extends GlobalSearchModule
                 true
             ),
             'img'        => Icon::create('learnmodule', $icon_role)->asImagePath(),
-            'date'       => $duration,
+            'date'       => htmlReady($duration),
             'expand'     => self::getSearchURL($search),
             'additional' => $additional,
         ];
diff --git a/lib/classes/globalsearch/GlobalSearchMyCourses.php b/lib/classes/globalsearch/GlobalSearchMyCourses.php
index acafde59d4315a528524cd415a0e387f2d9a0523..124fb176e07b4db8f6f182add90a312809cc8e0f 100644
--- a/lib/classes/globalsearch/GlobalSearchMyCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchMyCourses.php
@@ -153,7 +153,7 @@ class GlobalSearchMyCourses extends GlobalSearchModule
             'number'        => self::mark($course->veranstaltungsnummer, $search),
             'name'          => self::mark($course->getFullname(), $search),
             'url'           => URLHelper::getURL('seminar_main.php', ['cid' => $course->id], true),
-            'date'          => $semester->short_name,
+            'date'          => htmlReady($semester->short_name),
             'dates'         => $turnus_string,
             'has_children'  => count($course->children) > 0,
             'children'      => $result_children,