diff --git a/ground/classes/Helper.php b/ground/classes/Helper.php
index aa108ab..01b5000 100644
--- a/ground/classes/Helper.php
+++ b/ground/classes/Helper.php
@@ -7,7 +7,7 @@ class Helper
 		return (bool) $var;
 	}
 
-	public static function replaceLinks($string)
+	public static function replaceLinks($string, $linkTemplate = '/page/point/id/')
 	{
 		preg_match_all("(\[#\d*\])", $string, $links);
 		$links = isset($links[0]) ? $links[0] : FALSE;
@@ -23,7 +23,7 @@ class Helper
 					if ($linkPoint->id)
 					{
 						$linkPoint->name = str_replace('"', 'ʺ', $linkPoint->name);
-						$string = str_replace($link, '[<a href="/page/point/id/'.$linkId.'" title="'.$linkPoint->name.'"><span class="glyphicon glyphicon-link"></span></a>]', $string);
+						$string = str_replace($link, '[<a href="'.$linkTemplate.$linkId.'" title="'.$linkPoint->name.'"><span class="glyphicon glyphicon-link"></span></a>]', $string);
 					}
 				}
 			}
diff --git a/ground/controllers/JsonController.php b/ground/controllers/JsonController.php
index af25267..c45bcce 100644
--- a/ground/controllers/JsonController.php
+++ b/ground/controllers/JsonController.php
@@ -40,6 +40,7 @@ class JsonController extends Controller
 			$point = Point::model()->getByPK($id);
 
 			$point->descriptionHtml = nl2br($point->description);
+			$point->descriptionHtml = Helper::replaceLinks($point->descriptionHtml, '/?point=');
 			$point->name = htmlspecialchars($point->name);
 			$imgs = $point->photos;
 			$photosCount = 1;