diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 80579173..89f6f0e8 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1106,11 +1106,13 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
 	if (!empty($content->in_reply_to_status_id)) {
 		$thr_parent = $hostname . "::" . $content->in_reply_to_status_id;
 
-		if (
-			Item::exists(['uri' => $thr_parent, 'uid' => $uid])
-			|| Item::exists(['extid' => $thr_parent, 'uid' => $uid])
-		) {
-			$postarray['thr-parent'] = $thr_parent;
+		$item = Item::selectFirst(['uri'], ['uri' => $thr_parent, 'uid' => $uid]);
+		if (!DBA::isResult($item)) {
+			$item = Item::selectFirst(['uri'], ['extid' => $thr_parent, 'uid' => $uid]);
+		}
+
+		if (DBA::isResult($item)) {
+			$postarray['thr-parent'] = $item['uri'];
 			$postarray['object-type'] = Activity\ObjectType::COMMENT;
 		} else {
 			$postarray['object-type'] = Activity\ObjectType::NOTE;
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 4066bdec..9a3ce38e 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1584,11 +1584,13 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 	if ($post->in_reply_to_status_id_str != "") {
 		$thr_parent = "twitter::" . $post->in_reply_to_status_id_str;
 
-		if (
-			Item::exists(['uri' => $thr_parent, 'uid' => $uid])
-			|| Item::exists(['extid' => $thr_parent, 'uid' => $uid])
-		) {
-			$postarray['thr-parent'] = $thr_parent;
+		$item = Item::selectFirst(['uri'], ['uri' => $thr_parent, 'uid' => $uid]);
+		if (!DBA::isResult($item)) {
+			$item = Item::selectFirst(['uri'], ['extid' => $thr_parent, 'uid' => $uid]);
+		}
+
+		if (DBA::isResult($item)) {
+			$postarray['thr-parent'] = $item['uri'];
 			$postarray['object-type'] = Activity\ObjectType::COMMENT;
 		} else {
 			$postarray['object-type'] = Activity\ObjectType::NOTE;
@@ -1702,6 +1704,8 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 			$postarray['verb'] = Activity::ANNOUNCE;
 			$postarray['gravity'] = GRAVITY_ACTIVITY;
 			$postarray['object-type'] = Activity\ObjectType::NOTE;
+
+			$postarray['thr-parent'] = $retweet['uri'];
 		} else {
 			$retweet['source'] = $postarray['source'];
 			$retweet['private'] = $postarray['private'];
diff --git a/wppost/wppost.php b/wppost/wppost.php
index f9caf232..aac81967 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -44,7 +44,7 @@ function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
 }
 
 
-function wppost_settings(&$a, &$s) {
+function wppost_settings(&$a,&$s) {
 
 	if(! local_user())
 		return;
@@ -84,9 +84,8 @@ function wppost_settings(&$a, &$s) {
     $s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. DI::l10n()->t('Wordpress Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
-    $s .= '<label id="wppost-enable-label" for="wppost-enable">' . DI::l10n()->t('Enable WordPress Post Addon') . '</label>';
-	$s .= '<input type="hidden" name="wppost" value="0"/>';
-    $s .= '<input id="wppost-enable" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
+    $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . DI::l10n()->t('Enable WordPress Post Addon') . '</label>';
+    $s .= '<input id="wppost-checkbox" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-username-wrapper">';
@@ -106,13 +105,11 @@ function wppost_settings(&$a, &$s) {
 
     $s .= '<div id="wppost-bydefault-wrapper">';
     $s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . DI::l10n()->t('Post to WordPress by default') . '</label>';
-	$s .= '<input type="hidden" name="wp_bydefault" value="0"/>';
     $s .= '<input id="wppost-bydefault" type="checkbox" name="wp_bydefault" value="1" ' . $def_checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="wppost-backlink-wrapper">';
     $s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . DI::l10n()->t('Provide a backlink to the Friendica post') . '</label>';
-	$s .= '<input type="hidden" name="wp_backlink" value="0"/>';
     $s .= '<input id="wppost-backlink" type="checkbox" name="wp_backlink" value="1" ' . $back_checked . '/>';
     $s .= '</div><div class="clear"></div>';
     $s .= '<div id="wppost-backlinktext-wrapper">';
@@ -122,7 +119,6 @@ function wppost_settings(&$a, &$s) {
 
     $s .= '<div id="wppost-shortcheck-wrapper">';
     $s .= '<label id="wppost-shortcheck-label" for="wppost-shortcheck">' . DI::l10n()->t("Don't post messages that are too short") . '</label>';
-    $s .= '<input type="hidden" name="wp_shortcheck" value="0"/>';
     $s .= '<input id="wppost-shortcheck" type="checkbox" name="wp_shortcheck" value="1" '.$shortcheck_checked.'/>';
     $s .= '</div><div class="clear"></div>';
 
@@ -133,20 +129,22 @@ function wppost_settings(&$a, &$s) {
 }
 
 
-function wppost_settings_post(&$a, &$b)
-{
+function wppost_settings_post(&$a,&$b) {
+
 	if(!empty($_POST['wppost-submit'])) {
-		DI::pConfig()->set(local_user(), 'wppost', 'post'           , intval($_POST['wppost']));
-		DI::pConfig()->set(local_user(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
-		DI::pConfig()->set(local_user(), 'wppost', 'wp_username'    ,   trim($_POST['wp_username']));
-		DI::pConfig()->set(local_user(), 'wppost', 'wp_password'    ,   trim($_POST['wp_password']));
-		DI::pConfig()->set(local_user(), 'wppost', 'wp_blog'        ,   trim($_POST['wp_blog']));
-		DI::pConfig()->set(local_user(), 'wppost', 'backlink'       , intval($_POST['wp_backlink']));
-		DI::pConfig()->set(local_user(), 'wppost', 'shortcheck'     , intval($_POST['wp_shortcheck']));
-		$wp_backlink_text = BBCode::convert(trim($_POST['wp_backlink_text']), false, BBCode::BACKLINK);
+		DI::pConfig()->set(local_user(),'wppost','post',intval($_POST['wppost']));
+		DI::pConfig()->set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault'] ?? false));
+		DI::pConfig()->set(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
+		DI::pConfig()->set(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
+		DI::pConfig()->set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
+		DI::pConfig()->set(local_user(),'wppost','backlink',trim($_POST['wp_backlink'] ?? ''));
+		DI::pConfig()->set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
+		$wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text']));
+		$wp_backlink_text = BBCode::convert($wp_backlink_text, false, BBCode::BACKLINK);
 		$wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
-		DI::pConfig()->set(local_user(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
+		DI::pConfig()->set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
 	}
+
 }
 
 function wppost_hook_fork(&$a, &$b)
@@ -180,11 +178,11 @@ function wppost_post_local(&$a, &$b) {
 		return;
 	}
 
-	$wp_post   = intval(DI::pConfig()->get(local_user(), 'wppost', 'post'));
+	$wp_post   = intval(DI::pConfig()->get(local_user(),'wppost','post'));
 
 	$wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'wppost', 'post_by_default'))) {
+	if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'wppost','post_by_default'))) {
 		$wp_enable = 1;
 	}
 
@@ -272,7 +270,7 @@ function wppost_send(&$a, &$b)
 			// If no bookmark is found then take the first line
 			if ($wptitle == '') {
 				// Remove the share element before fetching the first line
-				$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism", "\n$1\n", $b['body']));
+				$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body']));
 
 				$title = HTML::toPlaintext(BBCode::convert($title, false), 0, true)."\n";
 				$pos = strpos($title, "\n");
@@ -290,8 +288,8 @@ function wppost_send(&$a, &$b)
 		$post = BBCode::convert($b['body'], false, BBCode::CONNECTORS);
 
 		// If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
-		$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism', "\n$1\n", $post);
-		$post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism', "\n$1\n", $post);
+		$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+		$post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
 
 		$post = $title.$post;