diff --git a/app/archiwapilsudski.hs b/app/archiwapilsudski.hs
index 31be618..50899d0 100644
--- a/app/archiwapilsudski.hs
+++ b/app/archiwapilsudski.hs
@@ -12,14 +12,17 @@ import Text.Regex.Posix
 import Text.Printf
 
 
-cleanText = arr (replace "\177" "a")
-        >>> arr (replace "\230" "c")
-        >>> arr (replace "\234" "e")
-        >>> arr (replace "\179" "l")
-        >>> arr (replace "\241" "n")
+cleanText = arr (replace "\261" "a")
+        >>> arr (replace "\263" "c")
+        >>> arr (replace "\281" "e")
+        >>> arr (replace "\322" "l")
+        >>> arr (replace "\321" "L")
+        >>> arr (replace "\324" "n")
         >>> arr (replace "\243" "o")
-        >>> arr (replace "\182" "s")
-        >>> arr (replace "(\188)|(\191)" "z")
+        >>> arr (replace "\347" "s")
+        >>> arr (replace "\346" "S")
+        >>> arr (replace "(\378)|(\380)" "z")
+        >>> arr (replace "(\377)|(\379)" "Z")
         >>> arr (replace "\160" "")
 
 cleanDate = arr (replace "\160" "")
@@ -38,8 +41,8 @@ getDate = proc doc -> do
   returnA -< cleanedDate
 
 getUrls = proc doc -> do
-  xpathTrees <- getXPathTrees "//div[@style='padding: 4px 7px;float:left;']/a" -< doc
-  urlList <- (getAttrValue "href" >>> arr ("http://archiwa.pilsudski.org/" ++ ) >>> intercalate "//") -< xpathTrees
+  xpathTrees <- getXPathTrees "//div[@style='padding: 4px 7px;float:left;']/a[contains(@href,'pdf')]" -< doc
+  urlList <- (getAttrValue "href" >>> arr ("http://archiwa.pilsudski.org/" ++))  -< xpathTrees
   returnA -< urlList
 
 extractRecordData = proc recordUrl -> do
@@ -47,7 +50,7 @@ extractRecordData = proc recordUrl -> do
   recordTitle <- getTitle -< doc
   recordDate <- getDate -< doc
   recordUrls <- getUrls -< doc
-  returnA -< recordUrls
+  returnA -< (recordUrls, recordTitle, recordDate)
 
 extractRecordLinks = extractLinks "//table[@class='tabelka']//a[contains(@href,'.php')]"
                  >>> extractLinks "//table[@class='tabelka']//td[@width='68%']/a[contains(@href,'.php')]"
@@ -55,23 +58,23 @@ extractRecordLinks = extractLinks "//table[@class='tabelka']//a[contains(@href,'
                  >>> extractRecordData
 
 
-toShadowItem :: (String, String) -> ShadowItem
-toShadowItem (url, title) =
+toShadowItem :: (String, String, String) -> ShadowItem
+toShadowItem (url, recordTitle, recordDate) =
   (defaultShadowItem url title) {
     originalDate = Just date,
     itype = "periodical",
     format = Just "pdf",
     finalUrl = url
     }
-  where title = title
-        date = "12-34-5678"
+  where title = recordTitle
+        date = recordDate
 
 
 main = do
-    let start = "https://archiwa.pilsudski.org/dokument.php?nonav=0&nrar=701&nrzesp=4&sygn=4&handle=701.180/16036"
+    let start = "https://archiwa.pilsudski.org/"
     let shadowLibrary = ShadowLibrary {logoUrl=Nothing,
                                        lname="Archiwa Pilsudski",
                                        abbrev="ArchPil",
                                        lLevel=0,
                                        webpage=start}
-    extractItemsStartingFromUrl shadowLibrary start (extractRecordData)
+    extractItemsStartingFromUrl shadowLibrary start (extractRecordLinks >>> arr toShadowItem)