diff --git a/src/Controller/ArticleController.php b/src/Controller/ArticleController.php
index 222d449..df75c48 100644
--- a/src/Controller/ArticleController.php
+++ b/src/Controller/ArticleController.php
@@ -60,7 +60,7 @@ class ArticleController  extends AbstractController
     /**
      * @throws InvalidArgumentException|CommonMarkException
      */
-    #[Route('/article/d/{slug}', name: 'article-slug')]
+    #[Route('/article/d/{slug}', name: 'article-slug', requirements: ['slug' => '.+'])]
     public function article(
         $slug,
         EntityManagerInterface $entityManager,
diff --git a/templates/components/Molecules/Card.html.twig b/templates/components/Molecules/Card.html.twig
index c817b78..61f5654 100644
--- a/templates/components/Molecules/Card.html.twig
+++ b/templates/components/Molecules/Card.html.twig
@@ -6,9 +6,9 @@
             {% endif %}
             <small>{{ article.createdAt|date('F j Y') }}</small>
         </div>
-        {% set link = path('article-slug', {slug: article.slug}) %}
+        {% set link = path('article-slug', {slug: article.slug|url_encode }) %}
         {% if cat  and mag %}
-            {% set link = path('magazine-category-article', {slug: article.slug, cat: cat, mag: mag}) %}
+            {% set link = path('magazine-category-article', {slug: article.slug|url_encode, cat: cat, mag: mag}) %}
         {% endif %}
         <a href="{{ link }}">
             <div class="card-header">