***************
*** 9,17 ****
  from django.core.cache import cache
  
  from pages import settings
- from pages.utils import normalize_url
  
- 
  class PageManager(models.Manager):
      """
      Page manager provide several filters to obtain pages :class:`QuerySet`
--- 9,16 ----
  from django.core.cache import cache
  
  from pages import settings
+ from pages.utils import normalize_url, filter_link
  
  class PageManager(models.Manager):
      """
      Page manager provide several filters to obtain pages :class:`QuerySet`
***************
*** 184,195 ****
              cache.set(PAGE_CONTENT_DICT_KEY % (page.id, ctype), content_dict)
  
          if language in content_dict and content_dict[language]:
-             return content_dict[language]
  
          if language_fallback:
              for lang in settings.PAGE_LANGUAGES:
                  if lang[0] in content_dict:
-                     return content_dict[lang[0]]
          return ''
  
      def get_content_slug_by_slug(self, slug):
--- 183,194 ----
              cache.set(PAGE_CONTENT_DICT_KEY % (page.id, ctype), content_dict)
  
          if language in content_dict and content_dict[language]:
+             return filter_link(content_dict[language], language)
  
          if language_fallback:
              for lang in settings.PAGE_LANGUAGES:
                  if lang[0] in content_dict:
+                     return filter_link(content_dict[lang[0]], lang[0])
          return ''
  
      def get_content_slug_by_slug(self, slug):
