diff --git a/defaults.ini b/defaults.ini
index 65a34ce7..0e5b52d7 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -1274,14 +1274,14 @@ extracategories:Stargate: Atlantis
 ## Clear FanFiction from defaults, site is original fiction.
 extratags:
 
-extra_valid_entries:size,universe,universeUrl,universeHTML,codes,notice
+extra_valid_entries:size,universe,universeUrl,universeHTML,sitetags,notice
 #extra_titlepage_entries:size,universeHTML,codes,notice
 
 size_label:Size
 universe_label:Universe
 universeUrl_label:Universe URL
 universeHTML_label:Universe
-codes_label:Codes
+sitetags_label:Site Tags
 notice_label:Notice
 
 ## Assume entryUrl, apply to "<a class='%slink' href='%s'>%s</a>" to
diff --git a/fanficdownloader/adapters/adapter_storiesonlinenet.py b/fanficdownloader/adapters/adapter_storiesonlinenet.py
index 34309d1a..4943aee6 100644
--- a/fanficdownloader/adapters/adapter_storiesonlinenet.py
+++ b/fanficdownloader/adapters/adapter_storiesonlinenet.py
@@ -284,9 +284,9 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter):
             if 'Sex' in label:
                 self.story.setMetadata('rating', value)
                 
-            if 'Codes' in label:
-                for code in value.split(' '):
-                    self.story.addToList('codes',code)
+            if 'Tags' in label:
+                for code in re.split(r'\s*,\s*', value.strip()):
+                     self.story.addToList('sitetags',code)
                     
             if 'Posted' in label:
                 self.story.setMetadata('datePublished', makeDate(stripHTML(value), self.dateformat))
diff --git a/plugin-defaults.ini b/plugin-defaults.ini
index 428d9d31..2dc098a2 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -1268,14 +1268,14 @@ extracategories:Stargate: Atlantis
 ## Clear FanFiction from defaults, site is original fiction.
 extratags:
 
-extra_valid_entries:size,universe,universeUrl,universeHTML,codes,notice
+extra_valid_entries:size,universe,universeUrl,universeHTML,sitetags,notice
 #extra_titlepage_entries:size,universeHTML,codes,notice
 
 size_label:Size
 universe_label:Universe
 universeUrl_label:Universe URL
 universeHTML_label:Universe
-codes_label:Codes
+sitetags_label:Site Tags
 notice_label:Notice
 
 ## Assume entryUrl, apply to "<a class='%slink' href='%s'>%s</a>" to