diff --git a/src/Http/Helpers/http.php b/src/Http/Helpers/http.php
index 510c674d7..83d0bcbad 100644
--- a/src/Http/Helpers/http.php
+++ b/src/Http/Helpers/http.php
@@ -123,7 +123,7 @@ function page_not_found()
 
     if ($isJson) {
         Response::json(
-            ['status' => 'error', 'message' => 'Page not found'],
+            ['status' => 'error', 'message' => 'Page not found',],
             StatusCode::NOT_FOUND
         );
     } else {
diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl
index ba27ac009..646c27ab1 100644
--- a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl
+++ b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl
@@ -71,7 +71,8 @@ class PostController extends BaseController
         $this->view->setParams([
             'title' => t('common.posts') . ' | ' . config()->get('app.name'),
             'posts' => $this->postService->transformData($paginatedPosts->data()->all()),
-            'pagination' => $paginatedPosts
+            'pagination' => $paginatedPosts,
+            'referer' => nav_ref_encode(Request::getQuery())
         ]);
 
         $response->html($this->view->render('post/post'));
@@ -105,7 +106,7 @@ class PostController extends BaseController
             'title' => $post->title . ' | ' . config()->get('app.name'),
             'post' => new RawParam(current($this->postService->transformData([$post]))),
             'comments' => $comments,
-            'referer' => $ref,
+            'referer' => nav_ref_decode($ref),
         ]);
 
         $response->html($this->view->render('post/single'));
diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl
index d6290d601..d31ed6b84 100644
--- a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl
+++ b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl
@@ -120,7 +120,7 @@ class PostManagementController extends BaseController
         $this->view->setParams([
             'title' => $post->title . ' | ' . config()->get('app.name'),
             'post' => $post->asArray(),
-            'referer' => $ref
+            'referer' => nav_ref_decode($ref)
         ]);
 
         $response->html($this->view->render('post/form'));
diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl
index a948498c3..fe2fbc38b 100644
--- a/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl
+++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl
@@ -1,3 +1,3 @@
-<a class='back-btn' title='Back' href="<?php echo  base_url(true) . '/' . current_lang() . '/' . $referer ?? 'posts'; ?>">
-        <i class='material-icons'>arrow_back</i>
+<a class='back-btn' title='Back' href="<?php echo (base_url(true) . '/' . current_lang() . $referer); ?>">
+    <i class='material-icons'>arrow_back</i>
 </a>
\ No newline at end of file
diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl
index 23755cfca..65709777c 100644
--- a/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl
+++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl
@@ -1,6 +1,6 @@
 <div class="col s12 m3 post-item">
     <div class="card post-card hoverable">
-        <a href="<?php echo base_url(true) . '/' . current_lang() . '/post/' . $post['uuid'] ?>" class="post-item-link">
+        <a href="<?php echo base_url(true) . '/' . current_lang() . '/post/' . $post['uuid'] . (!empty($referer) ? '?ref=' . $referer : '') ?>" class="post-item-link">
             <div class="card-image card-image-box">
                 <?php if ($post['image']) : ?>
                     <img src="<?php echo base_url() . '/uploads/' . $post['image'] ?>" class="content_img">