diff --git a/board.php b/board.php
index 2a4a51d..5dc4fb3 100644
--- a/board.php
+++ b/board.php
@@ -12,7 +12,7 @@ if (!isset($_SESSION['authenticated'])) {
 
 $config = require 'config.php';
 $boardId = $_GET['board'] ?? 'b';
-$threadId = $_GET['thread'] ?? null;
+$threadId = isset($_GET['thread']) ? urldecode($_GET['thread']) : null;
 
 try {
     $db = new PDO(
@@ -181,7 +181,7 @@ function formatMessage($message) {
                 <div class="thread-container">
                     <div class="thread-header">
                         <h2><?= htmlspecialchars($posts[0]['thread_title'] ?? 'Без названия') ?></h2>
-                        <a href="board.php?board=<?= htmlspecialchars($boardId) ?>" class="back-link">← Назад к списку</a>
+                        <a href="board.php?board=<?= urlencode($boardId) ?>" class="back-link">← Назад к списку</a>
                     </div>
                     
                     <div class="posts-container" id="posts">
@@ -220,7 +220,7 @@ function formatMessage($message) {
                         <?php foreach ($threads as $thread): ?>
                             <div class="thread-item">
                                 <div class="thread-header">
-                                    <a href="board.php?board=<?= htmlspecialchars($boardId) ?>&thread=<?= htmlspecialchars($thread['thread_id']) ?>" class="thread-link">
+                                    <a href="board.php?board=<?= urlencode($boardId) ?>&thread=<?= urlencode($thread['thread_id']) ?>" class="thread-link">
                                         <span class="thread-title"><?= htmlspecialchars($thread['title'] ?? 'Без названия') ?></span>
                                     </a>
                                     <span class="thread-info">
@@ -252,7 +252,7 @@ function formatMessage($message) {
 
         <?php if (!$threadId): ?>
             <div class="new-thread-button">
-                <a href="newthread.php?board=<?= htmlspecialchars($boardId) ?>" class="new-thread-btn">Создать новый тред</a>
+                <a href="newthread.php?board=<?= urlencode($boardId) ?>" class="new-thread-btn">Создать новый тред</a>
             </div>
         <?php else: ?>
             <div class="post-form">
diff --git a/index.php b/index.php
index 3fa34d0..10d27df 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,6 @@ header('Content-Type: text/html; charset=utf-8');
 header('X-Content-Type-Options: nosniff');
 header('X-Frame-Options: DENY');
 header('X-XSS-Protection: 1; mode=block');
-header('Content-Type: text/html; charset=utf-8');
 
 $config = require 'config.php';
 
@@ -155,7 +154,7 @@ if (isset($_GET['logout'])) {
             <div class="boards-list">
                 <?php foreach ($boards as $board): ?>
                     <div class="board-item">
-                        <a href="board.php?board=<?= htmlspecialchars($board['board_id']) ?>" class="board-link">
+                        <a href="board.php?board=<?= urlencode($board['board_id']) ?>" class="board-link">
                             <span class="board-id">/<?= htmlspecialchars($board['board_id']) ?>/</span>
                             <span class="board-name"><?= htmlspecialchars($board['name']) ?></span>
                             <span class="board-desc"><?= htmlspecialchars($board['description']) ?></span>
diff --git a/newthread.php b/newthread.php
index e47ac80..11b47b8 100644
--- a/newthread.php
+++ b/newthread.php
@@ -11,7 +11,7 @@ if (!isset($_SESSION['authenticated'])) {
 }
 
 $config = require 'config.php';
-$boardId = $_GET['board'] ?? 'b';
+$boardId = isset($_GET['board']) ? urldecode($_GET['board']) : 'b';
 
 try {
     $db = new PDO(
@@ -126,7 +126,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         <div class="header">
             <h1><a href="index.php" class="home-link">mkach</a> - Создать тред в /<?= htmlspecialchars($boardId) ?>/</h1>
             <div class="header-buttons">
-                <a href="board.php?board=<?= htmlspecialchars($boardId) ?>" class="boards-btn">← Назад</a>
+                <a href="board.php?board=<?= urlencode($boardId) ?>" class="boards-btn">← Назад</a>
                 <a href="index.php" class="boards-btn">Доски</a>
                 <a href="?logout=1" class="logout-btn">Выход</a>
             </div>
@@ -162,7 +162,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
                     
                     <div class="form-row">
                         <button type="submit" class="send-btn">Создать тред</button>
-                        <a href="board.php?board=<?= htmlspecialchars($boardId) ?>" class="cancel-btn">Отмена</a>
+                        <a href="board.php?board=<?= urlencode($boardId) ?>" class="cancel-btn">Отмена</a>
                     </div>
                 </form>
             </div>