diff --git a/src/config/config.py b/src/config/config.py
index a42feaa..6b79b3c 100644
--- a/src/config/config.py
+++ b/src/config/config.py
@@ -1,11 +1,11 @@
 __author__ = 'dev'
 
 Config = {
-    "FeedLinkTypes" :  {"audio/mpeg","application/x-bittorrent", "audio/opus"},
+    "FeedLinkTypes" :  {"audio/mpeg","application/x-bittorrent", "audio/opus", "audio/x-mp3", "audio/x-opus"},
     "FeedTypes" :  {"podcast","rss"},
-    "FeedStorageFolder" : "testfeeds",
+    "FeedStorageFolder" : "feeds",
     "FeedStoragePrefix" : { "0" : "FeedType", "1" : "FeedName"},
     "ConfigFileSuffix" : "-config",
     "ConfigFileExtension" : ".json",
     "TorrentStorageFolder": "testtorrents",
-}
\ No newline at end of file
+}
diff --git a/src/ui/web/cgi/cgi_server.py b/src/ui/web/cgi/cgi_server.py
index 1fdef61..b63d974 100644
--- a/src/ui/web/cgi/cgi_server.py
+++ b/src/ui/web/cgi/cgi_server.py
@@ -16,6 +16,6 @@ def runServer(workingDir, serverAddress=('',8080)):
         for file in glob.glob('*.py'):
             os.chmod(file, stat.S_IXUSR | stat.S_IWUSR | stat.S_IRUSR)
 
-    os.chdir('..')
+    os.chdir(workingDir)
     server = HTTPServer(serverAddress, CGIHTTPRequestHandler)
-    server.serve_forever()
\ No newline at end of file
+    server.serve_forever()
diff --git a/src/ui/web/cgi/pages/FileLoader.py b/src/ui/web/cgi/pages/FileLoader.py
index 8d0267f..a030279 100644
--- a/src/ui/web/cgi/pages/FileLoader.py
+++ b/src/ui/web/cgi/pages/FileLoader.py
@@ -42,7 +42,8 @@ page = '''Content-Type: text/html
 <li><audio src="../{MyLinkUrl}" controls preload="auto"></audio></li>
 <li>MyLink: <a href="../{MyLinkUrl}" target="_blank">{MyLinkUrl}</a></li>
 <li>OriginLink: <a href="{OriginEpisodeUrl}" target="_blank">{OriginEpisodeUrl}</a></li>
+</ul>
 </body>
 </html>'''.format(FeedName=feedName, EpisodeTitle=episodeTitle, OriginEpisodeUrl=originLink, MyLinkUrl=mylink)
 
-print(page)
\ No newline at end of file
+print(page)
diff --git a/src/utilities/podcastserializer.py b/src/utilities/podcastserializer.py
index 4b9f5d8..4617c3e 100644
--- a/src/utilities/podcastserializer.py
+++ b/src/utilities/podcastserializer.py
@@ -33,15 +33,19 @@ class PodcastSerializer(Serializer):
 
             if file_link == "":
                 continue
-
-            temp_episode = {
-                "title": episode["title"],
-                "subtitle": episode["subtitle"],
-                "file_link": file_link,
-                "pubdate": episode["published"],
-                "length": file_length
-            }
-            episode_list.append(temp_episode)
+            try :
+                temp_episode = {
+                    "title": episode["title"],
+                    "subtitle": "",
+                    "file_link": file_link,
+                    "pubdate": episode["published"],
+                    "length": file_length
+                }
+                if  episode.has_key('subtitle'):
+                    temp_episode["subtitle"] = episode["subtitle"]
+                episode_list.append(temp_episode)
+            except:
+                pass
 
         temp_dict = {
             "title": dict_object["feed"]["title"],
@@ -67,4 +71,3 @@ class PodcastSerializer(Serializer):
             episodes_list += "</item>"
 
         return RSS_Prefix + rss_channel_info + episodes_list + RSS_Suffix
-