diff --git a/src/Nocr.TelegramClient.AppServices/Handlers/BaseHandlers/StartHandlerBase.cs b/src/Nocr.TelegramClient.AppServices/Handlers/BaseHandlers/StartHandlerBase.cs
index 6122238..cfe4fd8 100644
--- a/src/Nocr.TelegramClient.AppServices/Handlers/BaseHandlers/StartHandlerBase.cs
+++ b/src/Nocr.TelegramClient.AppServices/Handlers/BaseHandlers/StartHandlerBase.cs
@@ -41,7 +41,7 @@ public abstract class StartHandlerBase
 
         var message = new TextMessage(telegramId)
         {
-            Text = Localizer.Get(nameof(StartMessageHandler), "Text"),
+            Text = Localizer.Get(nameof(StartHandlerBase), "Text"),
             ParseMode = ParseMode.Html,
             ReplyMarkup = GetKeyboard()
         };
@@ -59,7 +59,7 @@ public abstract class StartHandlerBase
     {
         var markup = new VerticalKeyboardMarkup();
 
-        markup.Add(new InlineKeyboardButton(Localizer.Get(nameof(StartMessageHandler), "SubscriptionsButton"))
+        markup.Add(new InlineKeyboardButton(Localizer.Get(nameof(StartHandlerBase), "SubscriptionsButton"))
         {
             CallbackData = NocrCallbackData.ViewSubscription().ToString()
         });
diff --git a/src/Nocr.TelegramClient.AppServices/Handlers/CallbackQueries/ViewSubscription/ViewSubscriptionHandler.cs b/src/Nocr.TelegramClient.AppServices/Handlers/CallbackQueries/ViewSubscription/ViewSubscriptionHandler.cs
index 681ef06..c334ecf 100644
--- a/src/Nocr.TelegramClient.AppServices/Handlers/CallbackQueries/ViewSubscription/ViewSubscriptionHandler.cs
+++ b/src/Nocr.TelegramClient.AppServices/Handlers/CallbackQueries/ViewSubscription/ViewSubscriptionHandler.cs
@@ -37,12 +37,4 @@ public class ViewSubscriptionHandler : ViewSubscriptionHandlerBase, IMatchingUpd
 
         await EditSubscriptionMessage(from, update.CallbackQuery.Message.MessageId, subscriptionId, cancellationToken);
     }
-
-    private void SendErrorMessage(long from)
-    {
-        MessageQueue.Enqueue(new TextMessage(from)
-        {
-            Text = Localizer.Get(nameof(ViewSubscriptionHandler), "FailedToViewSubscription")
-        });
-    }
 }
\ No newline at end of file
diff --git a/src/Nocr.TelegramClient.AppServices/Links/PublicTelegramMessageLink.cs b/src/Nocr.TelegramClient.AppServices/Links/PublicTelegramMessageLink.cs
index 0526513..aa13965 100644
--- a/src/Nocr.TelegramClient.AppServices/Links/PublicTelegramMessageLink.cs
+++ b/src/Nocr.TelegramClient.AppServices/Links/PublicTelegramMessageLink.cs
@@ -60,7 +60,7 @@ public readonly struct PublicTelegramMessageLink
             : $"https://t.me/{Username}/{MessageId}?{(SingleView ? "single" : string.Empty)}";
 
         var telegramLink = ThreadId.HasValue
-            ? $"tg://resolve?domain={Username}&post={MessageId}{(SingleView ? "&single" : string.Empty)}&thread={ThreadId.Value}"
+            ? $"tg://resolve?domain={Username}&post={MessageId}{(SingleView ? "&single" : string.Empty)}{(ThreadId.HasValue ? $"&thread={ThreadId.Value}" : string.Empty)}"
             : $"tg://resolve?domain={Username}&post={MessageId}{(SingleView ? "&single" : string.Empty)}";
 
         return (webLink, telegramLink);
diff --git a/src/Nocr.TelegramClient.Host/Resources/Handlers/TelegramHandlers/Base/StartHandlerBase/StartMessageHandler.ru-ru.json b/src/Nocr.TelegramClient.Host/Resources/Handlers/TelegramHandlers/Base/StartHandlerBase/StartHandler.ru-ru.json
similarity index 100%
rename from src/Nocr.TelegramClient.Host/Resources/Handlers/TelegramHandlers/Base/StartHandlerBase/StartMessageHandler.ru-ru.json
rename to src/Nocr.TelegramClient.Host/Resources/Handlers/TelegramHandlers/Base/StartHandlerBase/StartHandler.ru-ru.json