diff --git a/seminar/templates/seminar/archiv/Tituly.tex b/seminar/templates/seminar/archiv/Tituly.tex
deleted file mode 100644
index e69de29b..00000000
diff --git a/seminar/templates/seminar/archiv/tituly.tex b/seminar/templates/seminar/archiv/tituly.tex
new file mode 100644
index 00000000..323cf3b5
--- /dev/null
+++ b/seminar/templates/seminar/archiv/tituly.tex
@@ -0,0 +1,9 @@
+{% autoescape off %}
+{% load tex %}
+
+{% for r in resitele %}
+	{% spaceless %}
+\def\{{r.ascii}}{\titul{{r.titul|sloz}}\relax}
+	{% endspaceless %}
+{% endfor %}
+{% endautoescape %}
diff --git a/seminar/views.py b/seminar/views.py
index 8a625909..47316329 100644
--- a/seminar/views.py
+++ b/seminar/views.py
@@ -19,7 +19,7 @@ import subprocess
 import shutil
 import os
 from django.conf import settings
-
+import unicodedata
 
 def verejna_temata(rocnik):
     """Vrací queryset zveřejněných témat v daném ročníku.
@@ -350,13 +350,15 @@ def cisloObalkyView(request,rocnik,cislo):
     letos = CisloObalkyStruct()
     loni = CisloObalkyStruct()
 
-    letos.rocnik = Rocnik.objects.filter(rocnik = rocnik)
-    loni.rocnik = Rocnik.objects.filter(rocnik = int(rocnik)-1)
+    letos.rocnik = Rocnik.objects.filter(rocnik = rocnik)[0]
+    loni.rocnik = Rocnik.objects.filter(rocnik = int(rocnik)-1)[0]
     letos.problemy = Problem.objects.filter(cislo_zadani = Cislo.objects.filter(rocnik=letos.rocnik,cislo__lte = cislo))
     loni.problemy = Problem.objects.filter(cislo_zadani = Cislo.objects.filter(rocnik=loni.rocnik))
     letos.resitele = Resitel.objects.filter(reseni = Reseni.objects.filter(problem=letos.problemy)).distinct()
     loni.resitele = Resitel.objects.filter(reseni = Reseni.objects.filter(problem=loni.problemy)).distinct()
 
+    loni.resitele = loni.resitele.filter(rok_maturity__gt =  letos.rocnik.prvni_rok)
+
     if int(cislo) > 3:
         resitele = letos.resitele
     else:
@@ -383,17 +385,20 @@ def obalkyView(request,resitele):
 ### Tituly
 
 def TitulyView(request, rocnik, cislo):
-    resitele = Resitel.objects.all()
+    rocnik_obj = Rocnik.objects.filter(rocnik = rocnik).first()
+    resitele = Resitel.objects.filter(rok_maturity__gte = rocnik_obj.prvni_rok)
+    cislo_obj = Cislo.objects.filter(rocnik = rocnik_obj, cislo = cislo).first()
+
     for resitel in resitele:
-        rocnik_obj = Rocnik.objects.filter(rocnik = rocnik)
-        cislo_obj = Cislo.objects.filter(rocnik = rocnik_obj, cislo = cislo).first()
-        body = VysledkyKCisluOdjakziva.objects.filter(resitel = resitel, cislo = cislo_obj).first().body
+        vys = VysledkyKCisluOdjakziva.objects.filter(resitel = resitele, cislo = cislo_obj).first()
+        if vys == None:
+            body = 0
+        else: 
+            body = vys.body
         resitel.titul = resitel.get_titul(body)
+        resitel.ascii = unicodedata.normalize('NFKD',resitel.jmeno+resitel.prijmeni).encode("ascii","ignore").replace(" ","")
 
-    return render(request, 'seminar/archiv/Tituly.tex',
-             {'resitele': resitele,
-                          }
-             )
+    return render(request, 'seminar/archiv/tituly.tex',{'resitele': resitele})
 
 
 ### Soustredeni