diff --git a/include/items.php b/include/items.php
index 0ed444da2..56c834e44 100644
--- a/include/items.php
+++ b/include/items.php
@@ -20,7 +20,6 @@ use Friendica\Util\ParseUrl;
 use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
-require_once 'include/tags.php';
 require_once 'include/text.php';
 require_once 'include/threads.php';
 require_once 'mod/share.php';
diff --git a/include/tags.php b/include/tags.php
deleted file mode 100644
index 772255ed4..000000000
--- a/include/tags.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<?php
-/**
- * @file include/tags.php
- */
-use Friendica\App;
-use Friendica\Content\Feature;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-
-function create_tags_from_item($itemid)
-{
-	$profile_base = System::baseUrl();
-	$profile_data = parse_url($profile_base);
-	$profile_path = defaults($profile_data, 'path', '');
-	$profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/';
-	$profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/';
-
-	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `created`, `received`, `title`, `body`, `tag`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
-
-	if (!$messages)
-		return;
-
-	$message = $messages[0];
-
-	// Clean up all tags
-	q("DELETE FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d)",
-		intval(TERM_OBJ_POST),
-		intval($itemid),
-		intval(TERM_HASHTAG),
-		intval(TERM_MENTION));
-
-	if ($message['deleted']) {
-		return;
-	}
-
-	$taglist = explode(',', $message['tag']);
-
-	$tags = '';
-	foreach ($taglist as $tag) {
-		if ((substr(trim($tag), 0, 1) == '#') || (substr(trim($tag), 0, 1) == '@')) {
-			$tags .= ' ' . trim($tag);
-		} else {
-			$tags .= ' #' . trim($tag);
-		}
-	}
-
-	$data = ' ' . $message['title'] . ' ' . $message['body'] . ' ' . $tags . ' ';
-
-	// ignore anything in a code block
-	$data = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $data);
-
-	$tags = [];
-
-	$pattern = '/\W\#([^\[].*?)[\s\'".,:;\?!\[\]\/]/ism';
-	if (preg_match_all($pattern, $data, $matches)) {
-		foreach ($matches[1] as $match) {
-			$tags['#' . strtolower($match)] = '';
-		}
-	}
-
-	$pattern = '/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism';
-	if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
-		foreach ($matches as $match) {
-			$tags[$match[1] . strtolower(trim($match[3], ',.:;[]/\"?!'))] = $match[2];
-		}
-	}
-
-	foreach ($tags as $tag => $link) {
-		if (substr(trim($tag), 0, 1) == '#') {
-			// try to ignore #039 or #1 or anything like that
-			if (ctype_digit(substr(trim($tag), 1)))
-				continue;
-			// try to ignore html hex escapes, e.g. #x2317
-			if ((substr(trim($tag), 1, 1) == 'x' || substr(trim($tag), 1, 1) == 'X') && ctype_digit(substr(trim($tag), 2)))
-				continue;
-			$type = TERM_HASHTAG;
-			$term = substr($tag, 1);
-		} elseif (substr(trim($tag), 0, 1) == '@') {
-			$type = TERM_MENTION;
-			$term = substr($tag, 1);
-		} else { // This shouldn't happen
-			$type = TERM_HASHTAG;
-			$term = $tag;
-		}
-
-		if ($message['uid'] == 0) {
-			$global = true;
-
-			q("UPDATE `term` SET `global` = 1 WHERE `otype` = %d AND `guid` = '%s'",
-				intval(TERM_OBJ_POST), dbesc($message['guid']));
-		} else {
-			$isglobal = q("SELECT `global` FROM `term` WHERE `uid` = 0 AND `otype` = %d AND `guid` = '%s'",
-				intval(TERM_OBJ_POST), dbesc($message['guid']));
-
-			$global = (count($isglobal) > 0);
-		}
-
-		q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`, `guid`, `created`, `received`, `global`)
-				VALUES (%d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', %d)",
-			intval($message['uid']), intval($itemid), intval(TERM_OBJ_POST), intval($type), dbesc($term),
-			dbesc($link), dbesc($message['guid']), dbesc($message['created']), dbesc($message['received']), intval($global));
-
-		// Search for mentions
-		if ((substr($tag, 0, 1) == '@') && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) {
-			$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
-			foreach ($users AS $user) {
-				if ($user['uid'] == $message['uid']) {
-					q("UPDATE `item` SET `mention` = 1 WHERE `id` = %d", intval($itemid));
-
-					q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", intval($message['parent']));
-				}
-			}
-		}
-	}
-}
-
-function create_tags_from_itemuri($itemuri, $uid)
-{
-	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
-
-	if (count($messages)) {
-		foreach ($messages as $message) {
-			create_tags_from_item($message['id']);
-		}
-	}
-}
-
-function update_items()
-{
-	$messages = dba::p("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''");
-
-	logger('fetched messages: ' . dba::num_rows($messages));
-	while ($message = dba::fetch($messages)) {
-		if ($message['uid'] == 0) {
-			$global = true;
-
-			q("UPDATE `term` SET `global` = 1 WHERE `otype` = %d AND `guid` = '%s'",
-				intval(TERM_OBJ_POST), dbesc($message['guid']));
-		} else {
-			$isglobal = q("SELECT `global` FROM `term` WHERE `uid` = 0 AND `otype` = %d AND `guid` = '%s'",
-				intval(TERM_OBJ_POST), dbesc($message['guid']));
-
-			$global = (count($isglobal) > 0);
-		}
-
-		q("UPDATE `term` SET `guid` = '%s', `created` = '%s', `received` = '%s', `global` = %d WHERE `otype` = %d AND `oid` = %d",
-			dbesc($message['guid']), dbesc($message['created']), dbesc($message['received']),
-			intval($global), intval(TERM_OBJ_POST), intval($message['oid']));
-	}
-
-	dba::close($messages);
-
-	$messages = dba::p("SELECT `guid` FROM `item` WHERE `uid` = 0");
-
-	logger('fetched messages: ' . dba::num_rows($messages));
-	while ($message = dba::fetch(messages)) {
-		q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($message['guid']));
-	}
-
-	dba::close($messages);
-}
-
-/**
- * @brief Get alphabetical sorted array of used tags/terms of an user including
- * a weighting by frequency of use.
- *
- * @param int $uid      The user ID.
- * @param int $count    Max number of displayed tags/terms.
- * @param int $owner_id The contact id of the owner of the tagged items.
- * @param string $flags Special item flags.
- * @param int $type     The tag/term type.
- *
- * @return arr          Alphabetical sorted array of used tags of an user.
- */
-function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
-{
-	require_once 'include/security.php';
-
-	$item_condition = item_condition();
-	$sql_options = item_permissions_sql($uid);
-	$limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
-
-	if ($flags) {
-		if ($flags === 'wall') {
-			$sql_options .= ' AND `item`.`wall` ';
-		}
-	}
-
-	if ($owner_id) {
-		$sql_options .= ' AND `item`.`owner-id` = ' . intval($owner_id) . ' ';
-	}
-
-	// Fetch tags
-	$r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
-		LEFT JOIN `item` ON `term`.`oid` = `item`.`id`
-		WHERE `term`.`uid` = ? AND `term`.`type` = ?
-		AND `term`.`otype` = ?
-		AND $item_condition $sql_options
-		GROUP BY `term` ORDER BY `total` DESC $limit",
-		$uid,
-		$type,
-		TERM_OBJ_POST
-	);
-	if (!DBM::is_result($r)) {
-		return [];
-	}
-
-	return tag_calc($r);
-}
-
-/**
- * @brief Construct a tag/term cloud block for an user.
- *
- * @param int $uid      The user ID.
- * @param int $count    Max number of displayed tags/terms.
- * @param int $owner_id The contact ID of the owner of the tagged items.
- * @param string $flags Special item flags.
- * @param int $type     The tag/term type.
- *
- * @return string       HTML formatted output.
- */
-function wtagblock($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
-{
-	$o = '';
-	$r = tagadelic($uid, $count, $owner_id, $flags, $type);
-	if (count($r)) {
-		$contact = dba::selectFirst('contact', ['url'], ['id' => $uid]);
-		$url = System::removedBaseUrl($contact['url']);
-
-		foreach ($r as $rr) {
-			$tag['level'] = $rr[2];
-			$tag['url'] = $url . '?tag=' . urlencode($rr[0]);
-			$tag['name'] = $rr[0];
-
-			$tags[] = $tag;
-		}
-
-		$tpl = get_markup_template('tagblock_widget.tpl');
-		$o = replace_macros($tpl, [
-			'$title' => L10n::t('Tags'),
-			'$tags' => $tags
-		]);
-	}
-	return $o;
-}
-
-/**
- * @brief Calculate weighting of tags according to the frequency of use.
- *
- * @param array $arr Array of tags/terms with tag/term name and total count of use.
- * @return array     Alphabetical sorted array of used tags/terms of an user.
- */
-function tag_calc($arr)
-{
-	$tags = [];
-	$min = 1e9;
-	$max = -1e9;
-	$x = 0;
-
-	if (!$arr) {
-		return [];
-	}
-
-	foreach ($arr as $rr) {
-		$tags[$x][0] = $rr['term'];
-		$tags[$x][1] = log($rr['total']);
-		$tags[$x][2] = 0;
-		$min = min($min, $tags[$x][1]);
-		$max = max($max, $tags[$x][1]);
-		$x ++;
-	}
-
-	usort($tags, 'tags_sort');
-	$range = max(.01, $max - $min) * 1.0001;
-
-	for ($x = 0; $x < count($tags); $x ++) {
-		$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
-	}
-
-	return $tags;
-}
-
-/**
- * @brief Compare function to sort tags/terms alphabetically.
- *
- * @param type $a
- * @param type $b
- *
- * @return int
- */
-function tags_sort($a, $b)
-{
-	if (strtolower($a[0]) == strtolower($b[0])) {
-		return 0;
-	}
-	return ((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
-}
-
-/**
- * @brief Insert a tag cloud widget for the present profile.
- *
- * @param int     $limit Max number of displayed tags.
- * @return string HTML formattat output.
- */
-function tagcloud_wall_widget($limit = 50)
-{
-	$a = get_app();
-
-	if (!$a->profile['profile_uid'] || !$a->profile['url']) {
-		return '';
-	}
-
-	if (Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
-		$owner_id = Contact::getIdForURL($a->profile['url']);
-
-		if (!$owner_id) {
-			return '';
-		}
-		return wtagblock($a->profile['profile_uid'], $limit, $owner_id, 'wall');
-	}
-
-	return '';
-}
diff --git a/include/text.php b/include/text.php
index 26b153549..05575887a 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1905,7 +1905,7 @@ function file_tag_save_file($uid, $item, $file)
 			);
 		}
 
-		Term::createFromItem($item);
+		Term::insertFromFileFieldByItemId($item);
 
 		$saved = PConfig::get($uid, 'system', 'filetags');
 		if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
@@ -1944,7 +1944,7 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false)
 		intval($uid)
 	);
 
-	Term::createFromItem($item);
+	Term::insertFromFileFieldByItemId($item);
 
 	$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
 		dbesc($file),
diff --git a/mod/item.php b/mod/item.php
index ccf98667c..76f166624 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -32,7 +32,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 
 require_once 'include/enotify.php';
-require_once 'include/tags.php';
 require_once 'include/threads.php';
 require_once 'include/text.php';
 require_once 'include/items.php';
diff --git a/mod/photos.php b/mod/photos.php
index 56c5690d9..6742497ac 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -17,6 +17,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
+use Friendica\Model\Term;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
@@ -28,7 +29,6 @@ require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
 require_once 'include/bbcode.php';
 require_once 'include/security.php';
-require_once 'include/tags.php';
 require_once 'include/threads.php';
 
 function photos_init(App $a) {
@@ -296,7 +296,7 @@ function photos_post(App $a)
 						dbesc($rr['parent-uri']),
 						intval($page_owner_uid)
 					);
-					create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
+					Term::insertFromTagFieldByItemUri($rr['parent-uri'], $page_owner_uid);
 					delete_thread_uri($rr['parent-uri'], $page_owner_uid);
 
 					$drop_id = intval($rr['id']);
@@ -370,7 +370,7 @@ function photos_post(App $a)
 					dbesc($i[0]['uri']),
 					intval($page_owner_uid)
 				);
-				create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
+				Term::insertFromTagFieldByItemUri($i[0]['uri'], $page_owner_uid);
 				delete_thread_uri($i[0]['uri'], $page_owner_uid);
 
 				$url = System::baseUrl();
@@ -655,7 +655,7 @@ function photos_post(App $a)
 				intval($item_id),
 				intval($page_owner_uid)
 			);
-			create_tags_from_item($item_id);
+			Term::insertFromTagFieldByItemId($item_id);
 			update_thread($item_id);
 
 			$best = 0;
diff --git a/mod/profile.php b/mod/profile.php
index a2fff27e0..6602c4057 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -199,7 +199,7 @@ function profile_content(App $a, $update = 0)
 
 		$a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true);
 		$a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (x($category) ? xmlify($category) : ''));
-		$a->page['aside'] .= tagcloud_wall_widget();
+		$a->page['aside'] .= Widget::tagCloud();
 
 		if (can_write_wall($a->profile['profile_uid'])) {
 			$x = [
diff --git a/mod/videos.php b/mod/videos.php
index 69adf1091..7db81f6d2 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -13,6 +13,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
+use Friendica\Model\Term;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 
@@ -175,7 +176,7 @@ function videos_post(App $a) {
 					dbesc($i[0]['uri']),
 					intval(local_user())
 				);
-				create_tags_from_itemuri($i[0]['uri'], local_user());
+				Term::insertFromTagFieldByItemUri($i[0]['uri'], local_user());
 				delete_thread_uri($i[0]['uri'], local_user());
 
 				$url = System::baseUrl();
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index e019de963..c66a4ea9d 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -12,12 +12,13 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
-
 use dba;
 
 require_once 'boot.php';
+require_once 'include/dba.php';
 
 class Widget
 {
@@ -312,4 +313,31 @@ class Widget
 			'$items' => $r)
 		);
 	}
+
+	/**
+	 * Insert a tag cloud widget for the present profile.
+	 *
+	 * @brief Insert a tag cloud widget for the present profile.
+	 * @param int     $limit Max number of displayed tags.
+	 * @return string HTML formatted output.
+	 */
+	public static function tagCloud($limit = 50)
+	{
+		$a = get_app();
+
+		if (!$a->profile['profile_uid'] || !$a->profile['url']) {
+			return '';
+		}
+
+		if (Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
+			$owner_id = Contact::getIdForURL($a->profile['url']);
+
+			if (!$owner_id) {
+				return '';
+			}
+			return Widget\TagCloud::getHTML($a->profile['profile_uid'], $limit, $owner_id, 'wall');
+		}
+
+		return '';
+	}
 }
diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
new file mode 100644
index 000000000..a80c2e871
--- /dev/null
+++ b/src/Content/Widget/TagCloud.php
@@ -0,0 +1,162 @@
+<?php
+
+/*
+ * @file src/Content/Widget/TagCloud.php
+ */
+
+namespace Friendica\Content\Widget;
+
+use dba;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
+require_once 'include/dba.php';
+require_once 'include/security.php';
+
+/**
+ * TagCloud widget
+ *
+ * @author Rabuzarus
+ */
+class TagCloud
+{
+	/**
+	 * Construct a tag/term cloud block for an user.
+	 *
+	 * @brief Construct a tag/term cloud block for an user.
+	 * @param int $uid      The user ID.
+	 * @param int $count    Max number of displayed tags/terms.
+	 * @param int $owner_id The contact ID of the owner of the tagged items.
+	 * @param string $flags Special item flags.
+	 * @param int $type     The tag/term type.
+	 *
+	 * @return string       HTML formatted output.
+	 */
+	public static function getHTML($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
+	{
+		$o = '';
+		$r = self::tagadelic($uid, $count, $owner_id, $flags, $type);
+		if (count($r)) {
+			$contact = dba::selectFirst('contact', ['url'], ['id' => $uid]);
+			$url = System::removedBaseUrl($contact['url']);
+
+			foreach ($r as $rr) {
+				$tag['level'] = $rr[2];
+				$tag['url'] = $url . '?tag=' . urlencode($rr[0]);
+				$tag['name'] = $rr[0];
+
+				$tags[] = $tag;
+			}
+
+			$tpl = get_markup_template('tagblock_widget.tpl');
+			$o = replace_macros($tpl, [
+				'$title' => L10n::t('Tags'),
+				'$tags' => $tags
+			]);
+		}
+		return $o;
+	}
+
+	/**
+	 * Get alphabetical sorted array of used tags/terms of an user including
+	 * a weighting by frequency of use.
+	 *
+	 * @brief Get alphabetical sorted array of used tags/terms of an user including
+	 * a weighting by frequency of use.
+	 * @param int $uid      The user ID.
+	 * @param int $count    Max number of displayed tags/terms.
+	 * @param int $owner_id The contact id of the owner of the tagged items.
+	 * @param string $flags Special item flags.
+	 * @param int $type     The tag/term type.
+	 *
+	 * @return arr          Alphabetical sorted array of used tags of an user.
+	 */
+	private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
+	{
+		$item_condition = item_condition();
+		$sql_options = item_permissions_sql($uid);
+		$limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
+
+		if ($flags) {
+			if ($flags === 'wall') {
+				$sql_options .= ' AND `item`.`wall` ';
+			}
+		}
+
+		if ($owner_id) {
+			$sql_options .= ' AND `item`.`owner-id` = ' . intval($owner_id) . ' ';
+		}
+
+		// Fetch tags
+		$r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
+			LEFT JOIN `item` ON `term`.`oid` = `item`.`id`
+			WHERE `term`.`uid` = ? AND `term`.`type` = ?
+			AND `term`.`otype` = ?
+			AND $item_condition $sql_options
+			GROUP BY `term` ORDER BY `total` DESC $limit",
+			$uid,
+			$type,
+			TERM_OBJ_POST
+		);
+		if (!DBM::is_result($r)) {
+			return [];
+		}
+
+		return self::tagCalc($r);
+	}
+
+	/**
+	 * Calculate weighting of tags according to the frequency of use.
+	 *
+	 * @brief Calculate weighting of tags according to the frequency of use.
+	 * @param array $arr Array of tags/terms with tag/term name and total count of use.
+	 * @return array     Alphabetical sorted array of used tags/terms of an user.
+	 */
+	private static function tagCalc($arr)
+	{
+		$tags = [];
+		$min = 1e9;
+		$max = -1e9;
+		$x = 0;
+
+		if (!$arr) {
+			return [];
+		}
+
+		foreach ($arr as $rr) {
+			$tags[$x][0] = $rr['term'];
+			$tags[$x][1] = log($rr['total']);
+			$tags[$x][2] = 0;
+			$min = min($min, $tags[$x][1]);
+			$max = max($max, $tags[$x][1]);
+			$x ++;
+		}
+
+		usort($tags, 'self::tagsSort');
+		$range = max(.01, $max - $min) * 1.0001;
+
+		for ($x = 0; $x < count($tags); $x ++) {
+			$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
+		}
+
+		return $tags;
+	}
+
+	/**
+	 * Compare function to sort tags/terms alphabetically.
+	 *
+	 * @brief Compare function to sort tags/terms alphabetically.
+	 * @param type $a
+	 * @param type $b
+	 *
+	 * @return int
+	 */
+	private static function tagsSort($a, $b)
+	{
+		if (strtolower($a[0]) == strtolower($b[0])) {
+			return 0;
+		}
+		return ((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
+	}
+}
diff --git a/src/Model/Item.php b/src/Model/Item.php
index d83546e34..e7db218ed 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -27,7 +27,6 @@ use dba;
 use Text_LanguageDetect;
 
 require_once 'boot.php';
-require_once 'include/tags.php';
 require_once 'include/threads.php';
 require_once 'include/items.php';
 require_once 'include/text.php';
@@ -70,8 +69,8 @@ class Item extends BaseObject
 				continue;
 			}
 
-			create_tags_from_item($item['id']);
-			Term::createFromItem($item['id']);
+			Term::insertFromTagFieldByItemId($item['id']);
+			Term::insertFromFileFieldByItemId($item['id']);
 			update_thread($item['id']);
 
 			Worker::add(PRIORITY_HIGH, "Notifier", 'edit_post', $item['id']);
@@ -152,8 +151,8 @@ class Item extends BaseObject
 					'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()],
 				['id' => $item['id']]);
 
-		create_tags_from_item($item['id']);
-		Term::createFromItem($item['id']);
+		Term::insertFromTagFieldByItemId($item['id']);
+		Term::insertFromFileFieldByItemId($item['id']);
 		delete_thread($item['id'], $item['parent-uri']);
 
 		// If it's the parent of a comment thread, kill all the kids
@@ -791,8 +790,8 @@ class Item extends BaseObject
 		 * Due to deadlock issues with the "term" table we are doing these steps after the commit.
 		 * This is not perfect - but a workable solution until we found the reason for the problem.
 		 */
-		create_tags_from_item($current_post);
-		Term::createFromItem($current_post);
+		Term::insertFromTagFieldByItemId($current_post);
+		Term::insertFromFileFieldByItemId($current_post);
 
 		if ($arr['parent-uri'] === $arr['uri']) {
 			self::addShadow($current_post);
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 5f536cae4..c730bf744 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -4,20 +4,145 @@
  */
 namespace Friendica\Model;
 
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 use dba;
 
-require_once "include/dba.php";
+require_once 'boot.php';
+require_once 'include/dba.php';
 
 class Term
 {
+	public static function insertFromTagFieldByItemId($itemid)
+	{
+		$profile_base = System::baseUrl();
+		$profile_data = parse_url($profile_base);
+		$profile_path = defaults($profile_data, 'path', '');
+		$profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/';
+		$profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/';
+
+		$fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'tag', 'parent'];
+		$message = dba::selectFirst('item', $fields, ['id' => $itemid]);
+		if (!DBM::is_result($message)) {
+			return;
+		}
+
+		// Clean up all tags
+		dba::e("DELETE FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?)",
+			TERM_OBJ_POST, $itemid, TERM_HASHTAG, TERM_MENTION);
+
+		if ($message['deleted']) {
+			return;
+		}
+
+		$taglist = explode(',', $message['tag']);
+
+		$tags_string = '';
+		foreach ($taglist as $tag) {
+			if ((substr(trim($tag), 0, 1) == '#') || (substr(trim($tag), 0, 1) == '@')) {
+				$tags_string .= ' ' . trim($tag);
+			} else {
+				$tags_string .= ' #' . trim($tag);
+			}
+		}
+
+		$data = ' ' . $message['title'] . ' ' . $message['body'] . ' ' . $tags_string . ' ';
+
+		// ignore anything in a code block
+		$data = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $data);
+
+		$tags = [];
+
+		$pattern = '/\W\#([^\[].*?)[\s\'".,:;\?!\[\]\/]/ism';
+		if (preg_match_all($pattern, $data, $matches)) {
+			foreach ($matches[1] as $match) {
+				$tags['#' . strtolower($match)] = '';
+			}
+		}
+
+		$pattern = '/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism';
+		if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
+			foreach ($matches as $match) {
+				$tags[$match[1] . strtolower(trim($match[3], ',.:;[]/\"?!'))] = $match[2];
+			}
+		}
+
+		foreach ($tags as $tag => $link) {
+			if (substr(trim($tag), 0, 1) == '#') {
+				// try to ignore #039 or #1 or anything like that
+				if (ctype_digit(substr(trim($tag), 1))) {
+					continue;
+				}
+
+				// try to ignore html hex escapes, e.g. #x2317
+				if ((substr(trim($tag), 1, 1) == 'x' || substr(trim($tag), 1, 1) == 'X') && ctype_digit(substr(trim($tag), 2))) {
+					continue;
+				}
+
+				$type = TERM_HASHTAG;
+				$term = substr($tag, 1);
+			} elseif (substr(trim($tag), 0, 1) == '@') {
+				$type = TERM_MENTION;
+				$term = substr($tag, 1);
+			} else { // This shouldn't happen
+				$type = TERM_HASHTAG;
+				$term = $tag;
+			}
+
+			if ($message['uid'] == 0) {
+				$global = true;
+				dba::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+			} else {
+				$global = dba::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+			}
+
+			dba::insert('term', [
+				'uid'      => $message['uid'],
+				'oid'      => $itemid,
+				'otype'    => TERM_OBJ_POST,
+				'type'     => $type,
+				'term'     => $term,
+				'url'      => $link,
+				'guid'     => $message['guid'],
+				'created'  => $message['created'],
+				'received' => $message['received'],
+				'global'   => $global
+			]);
+
+			// Search for mentions
+			if ((substr($tag, 0, 1) == '@') && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) {
+				$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
+				foreach ($users AS $user) {
+					if ($user['uid'] == $message['uid']) {
+						dba::update('item', ['mention' => true], ['id' => $itemid]);
+						dba::update('thread', ['mention' => true], ['iid' => $message['parent']]);
+					}
+				}
+			}
+		}
+	}
+
+	public static function insertFromTagFieldByItemUri($itemuri, $uid)
+	{
+		$messages = dba::select('item', ['id'], ['uri' => $itemuri, 'uid' => $uid]);
+
+		if (DBM::is_result($messages)) {
+			while ($message = dba::fetch($messages)) {
+				self::insertFromTagFieldByItemId($message['id']);
+			}
+			dba::close($messages);
+		}
+	}
+
+
 	/**
 	 * @param integer $itemid item id
 	 * @return void
 	 */
-	public static function createFromItem($itemid)
+	public static function insertFromFileFieldByItemId($itemid)
 	{
 		$message = dba::selectFirst('item', ['uid', 'deleted', 'file'], ['id' => $itemid]);
-		if (!\Friendica\Database\DBM::is_result($message)) {
+		if (!DBM::is_result($message)) {
 			return;
 		}
 
@@ -62,13 +187,13 @@ class Term
 	 * @param integer $uid     uid
 	 * @return void
 	 */
-	public static function createFromItemURI($itemuri, $uid)
+	public static function insertFromFileFieldByItemUri($itemuri, $uid)
 	{
 		$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
 		if (count($messages)) {
 			foreach ($messages as $message) {
-				self::createFromItem($message["id"]);
+				self::insertFromFileFieldByItemId($message["id"]);
 			}
 		}
 	}
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 2269bffcf..a9c5f04d3 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -42,7 +42,6 @@ require_once 'include/dba.php';
 require_once "include/enotify.php";
 require_once "include/threads.php";
 require_once "include/items.php";
-require_once "include/tags.php";
 require_once "include/event.php";
 require_once "include/text.php";
 require_once "include/html2bbcode.php";
@@ -2092,7 +2091,7 @@ class DFRN
 			$condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
 			dba::update('item', $fields, $condition);
 
-			create_tags_from_itemuri($item["uri"], $importer["importer_uid"]);
+			Term::insertFromTagFieldByItemUri($item["uri"], $importer["importer_uid"]);
 			update_thread_uri($item["uri"], $importer["importer_uid"]);
 
 			$changed = true;
@@ -2336,7 +2335,7 @@ class DFRN
 								dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
 								intval($r[0]["id"])
 							);
-							create_tags_from_item($r[0]["id"]);
+							Term::insertFromTagFieldByItemId($r[0]["id"]);
 						}
 					}
 				}
@@ -2824,7 +2823,7 @@ class DFRN
 								dbesc(implode(',', $newtags)),
 								intval($i[0]["id"])
 							);
-							create_tags_from_item($i[0]["id"]);
+							Term::insertFromTagFieldByItemId($i[0]["id"]);
 						}
 					}
 				}
@@ -2840,8 +2839,8 @@ class DFRN
 					dbesc($uri),
 					intval($importer["uid"])
 				);
-				create_tags_from_itemuri($uri, $importer["uid"]);
-				Term::createFromItemURI($uri, $importer["uid"]);
+				Term::insertFromTagFieldByItemUri($uri, $importer["uid"]);
+				Term::insertFromFileFieldByItemUri($uri, $importer["uid"]);
 				update_thread_uri($uri, $importer["uid"]);
 			} else {
 				$r = q(
@@ -2853,8 +2852,8 @@ class DFRN
 					dbesc($uri),
 					intval($importer["uid"])
 				);
-				create_tags_from_itemuri($uri, $importer["uid"]);
-				Term::createFromItemURI($uri, $importer["uid"]);
+				Term::insertFromTagFieldByItemUri($uri, $importer["uid"]);
+				Term::insertFromFileFieldByItemUri($uri, $importer["uid"]);
 				update_thread_uri($uri, $importer["importer_uid"]);
 
 				// if this is a relayed delete, propagate it to other recipients
diff --git a/src/Worker/TagUpdate.php b/src/Worker/TagUpdate.php
index 93423ecb2..fa3079731 100644
--- a/src/Worker/TagUpdate.php
+++ b/src/Worker/TagUpdate.php
@@ -1,10 +1,41 @@
 <?php
+
 namespace Friendica\Worker;
 
-require_once("include/tags.php");
+class TagUpdate
+{
+	public static function execute()
+	{
+		$messages = dba::p("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''");
 
-class TagUpdate {
-	public static function execute() {
-		update_items();
+		logger('fetched messages: ' . dba::num_rows($messages));
+		while ($message = dba::fetch($messages)) {
+			if ($message['uid'] == 0) {
+				$global = true;
+
+				q("UPDATE `term` SET `global` = 1 WHERE `otype` = %d AND `guid` = '%s'",
+					intval(TERM_OBJ_POST), dbesc($message['guid']));
+			} else {
+				$isglobal = q("SELECT `global` FROM `term` WHERE `uid` = 0 AND `otype` = %d AND `guid` = '%s'",
+					intval(TERM_OBJ_POST), dbesc($message['guid']));
+
+				$global = (count($isglobal) > 0);
+			}
+
+			q("UPDATE `term` SET `guid` = '%s', `created` = '%s', `received` = '%s', `global` = %d WHERE `otype` = %d AND `oid` = %d",
+				dbesc($message['guid']), dbesc($message['created']), dbesc($message['received']),
+				intval($global), intval(TERM_OBJ_POST), intval($message['oid']));
+		}
+
+		dba::close($messages);
+
+		$messages = dba::p("SELECT `guid` FROM `item` WHERE `uid` = 0");
+
+		logger('fetched messages: ' . dba::num_rows($messages));
+		while ($message = dba::fetch(messages)) {
+			q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($message['guid']));
+		}
+
+		dba::close($messages);
 	}
 }