diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 866b0b11..62b18d15 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -417,7 +417,7 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
 		throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown post with guid: %s', $args['guid']));
 	}
 
-	$tags = Tag::populateFromItem($item);
+	$tags = Tag::populateTagsFromItem($item);
 
 	$item['tags'] = $tags['tags'];
 	$item['hashtags'] = $tags['hashtags'];
diff --git a/twitter/twitter.php b/twitter/twitter.php
index a52ce8e9..7500b90a 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -79,6 +79,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Group;
+use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\ItemContent;
 use Friendica\Model\ItemURI;
@@ -1069,13 +1070,15 @@ function twitter_fetch_contact($uid, $data, $create_user)
 	}
 
 	$avatar = twitter_fix_avatar($data->profile_image_url_https);
-	$url = "https://twitter.com/" . $data->screen_name;
+	$baseurl = "https://twitter.com";
+	$url = $baseurl . "/" . $data->screen_name;
 	$addr = $data->screen_name . "@twitter.com";
 
 	$fields = ['url' => $url, 'network' => Protocol::TWITTER,
 		'alias' => 'twitter::' . $data->id_str,
+		'baseurl' => $baseurl, 'gsid' => GServer::getID($baseurl),
 		'name' => $data->name, 'nick' => $data->screen_name, 'addr' => $addr,
-                'location' => $data->location, 'about' => $data->description];
+		'location' => $data->location, 'about' => $data->description];
 
 	// Update the public contact
 	$pcontact = DBA::selectFirst('contact', ['id'], ['uid' => 0, 'alias' => "twitter::" . $data->id_str]);