diff --git a/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs b/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs
index 2e8d7a3..ed401a6 100644
--- a/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs
+++ b/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs
@@ -44,6 +44,8 @@ namespace BirdsiteLive.Domain.Tools
             // Replace return lines
             messageContent = Regex.Replace(messageContent, @"\r\n\r\n?|\n\n", "</p><p> ");
             messageContent = Regex.Replace(messageContent, @"\r\n?|\n", "<br/> ");
+            messageContent = Regex.Replace(messageContent, @"\(@", "( @");
+            messageContent = Regex.Replace(messageContent, @"\(#", "( #");
 
             // Secure emojis
             var emojiMatch = _emojiRegex.Matches(messageContent);
@@ -83,7 +85,7 @@ namespace BirdsiteLive.Domain.Tools
 
             // Extract Hashtags
             var hashtagMatch = OrderByLength(_hastagRegex.Matches(messageContent));
-            foreach (Match m in hashtagMatch)
+            foreach (Match m in hashtagMatch.OrderByDescending(x => x.Length))
             {
                 var tag = m.ToString().Replace("#", string.Empty).Replace("\n", string.Empty).Trim();
                 var url = $"https://{_instanceSettings.Domain}/tags/{tag}";
@@ -101,7 +103,7 @@ namespace BirdsiteLive.Domain.Tools
 
             // Extract Mentions
             var mentionMatch = OrderByLength(_mentionRegex.Matches(messageContent));
-            foreach (Match m in mentionMatch)
+            foreach (Match m in mentionMatch.OrderByDescending(x => x.Length))
             {
                 var mention = m.ToString().Replace("@", string.Empty).Replace("\n", string.Empty).Trim();
                 var url = $"https://{_instanceSettings.Domain}/users/{mention}";
diff --git a/src/BirdsiteLive/BirdsiteLive.csproj b/src/BirdsiteLive/BirdsiteLive.csproj
index f38be3b..ea56b70 100644
--- a/src/BirdsiteLive/BirdsiteLive.csproj
+++ b/src/BirdsiteLive/BirdsiteLive.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>d21486de-a812-47eb-a419-05682bb68856</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>0.6.0</Version>
+    <Version>0.6.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tests/BirdsiteLive.Domain.Tests/Tools/StatusExtractorTests.cs b/src/Tests/BirdsiteLive.Domain.Tests/Tools/StatusExtractorTests.cs
index 3edf9c8..32d1faa 100644
--- a/src/Tests/BirdsiteLive.Domain.Tests/Tools/StatusExtractorTests.cs
+++ b/src/Tests/BirdsiteLive.Domain.Tests/Tools/StatusExtractorTests.cs
@@ -335,5 +335,22 @@ namespace BirdsiteLive.Domain.Tests.Tools
             Assert.IsTrue(result.content.Contains(@"😎 😍 🤗 🤩 😘"));
             #endregion
         }
+
+        [TestMethod]
+        public void Extract_Parenthesis_Test()
+        {
+            #region Stubs
+            var message = $"bla (@mynickname test)";
+            //var message = $"tests@mynickname";
+            #endregion
+
+            var service = new StatusExtractor(_settings);
+            var result = service.ExtractTags(message);
+
+            #region Validations
+            Assert.AreEqual(1, result.tags.Length);
+            Assert.IsTrue(result.content.Equals(@"bla ( <span class=""h-card""><a href=""https://domain.name/@mynickname"" class=""u-url mention"">@<span>mynickname</span></a></span> test)"));
+            #endregion
+        }
     }
 }
\ No newline at end of file