diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index e0ec217c..3ee4bb0d 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -5,11 +5,15 @@ namespace App\Http\Controllers;
 
 use Backpack\PageManager\app\Models\Page;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Str;
+
 class PageController extends Controller
 {
     public function index($slug, $subs = null)
     {
-        $page = Page::findBySlug($slug.'_'.Config::get('app.locale'));
+        $page_slug = Str::endsWith($slug,'_tk') || Str::endsWith($slug,'_ru')? $slug : $slug.'_'.config('app.locale');
+
+        $page = Page::findBySlug($page_slug);
 
         if (!$page)
         {
diff --git a/app/Models/Page.php b/app/Models/Page.php
index 57b0c5d3..0d446103 100644
--- a/app/Models/Page.php
+++ b/app/Models/Page.php
@@ -58,16 +58,13 @@ class Page extends Model
 
     public function getPageLink()
     {
-
-        $slug = $this->slug?:Str::substr($this->slug,0,Str::length($this->slug)-3);
-
-        return url($slug);
+        return url($this->slug);
     }
 
     public function getOpenButton()
     {
         return '<a class="btn btn-default btn-xs" href="'.$this->getPageLink().'" target="_blank">'.
-            '<i class="fa fa-eye"></i> '.$this->getPageLink().trans('backpack::pagemanager.open').'</a>';
+            '<i class="fa fa-eye"></i> '.trans('backpack::pagemanager.open').'</a>';
     }
 
     /*
@@ -98,6 +95,7 @@ class Page extends Model
         return $this->title;
     }
 
+
     /*
     |--------------------------------------------------------------------------
     | MUTATORS