diff --git a/config/config.php b/config/config.php
index 8990e05..c49dc14 100644
--- a/config/config.php
+++ b/config/config.php
@@ -100,6 +100,8 @@
 $GLOBALS['tags_extension']['sourcetable'][] = 'tl_content';
 $GLOBALS['tags_extension']['sourcetable'][] = 'tl_news';
 $GLOBALS['tags_extension']['sourcetable'][] = 'tl_member';
+$GLOBALS['tags_extension']['sourcetable'][] = 'tl_faq';
+$GLOBALS['tags_extension']['sourcetable'][] = 'fl_files';
 
 /**
 * Add 'tag' to the URL keywords to prevent problems with URL manipulating modules like folderurl
diff --git a/dca/tl_calendar.php b/dca/tl_calendar.php
index 78d6029..56fb8f1 100644
--- a/dca/tl_calendar.php
+++ b/dca/tl_calendar.php
@@ -11,6 +11,7 @@
 if (@class_exists("tl_calendar"))
 {
 
+	/*
 if (is_array($GLOBALS['TL_DCA']['tl_calendar']['config']['onload_callback']))
 {
 	foreach ($GLOBALS['TL_DCA']['tl_calendar']['config']['onload_callback'] as $key => $arr)
@@ -21,6 +22,7 @@
 		}
 	}
 }
+*/
 
 }
 
diff --git a/dca/tl_calendar_events.php b/dca/tl_calendar_events.php
index a57ad5d..a93137e 100644
--- a/dca/tl_calendar_events.php
+++ b/dca/tl_calendar_events.php
@@ -11,6 +11,7 @@
 if (@class_exists("tl_calendar_events"))
 {
 
+	/*
 if (is_array($GLOBALS['TL_DCA']['tl_calendar_events']['config']['onload_callback']))
 {
 	foreach ($GLOBALS['TL_DCA']['tl_calendar_events']['config']['onload_callback'] as $key => $arr)
@@ -21,6 +22,7 @@
 		}
 	}
 }
+*/
 
 class tl_calendar_events_tags extends \Backend
 {
diff --git a/dca/tl_content.php b/dca/tl_content.php
index dc944bc..4766cf3 100644
--- a/dca/tl_content.php
+++ b/dca/tl_content.php
@@ -13,22 +13,23 @@
 } else {
 	$disabledObjects = array();
 }
+
 if (!in_array('tl_content', $disabledObjects))
 {
-	foreach ($GLOBALS['TL_DCA']['tl_content']['palettes'] as $key => $palette)
+	foreach ($GLOBALS['TL_DCA']['tl_content']['palettes'] as $key => &$palette)
 	{
 		if (strcmp($key, '__selector__') != 0)
 		{
-			$value = $GLOBALS['TL_DCA']['tl_content']['palettes'][$key];
-			if (strlen($value) >= 2) {
-				$pos = strpos($value, '{', 2);
+			if (strlen($palette) >= 2) {
+				$pos = strpos($palette, '{', 2);
 				if ($pos !== FALSE)
 				{
-					$GLOBALS['TL_DCA']['tl_content']['palettes'][$key] = substr($GLOBALS['TL_DCA']['tl_content']['palettes'][$key],0,$pos) . "{tags_legend:hide},tags;" . substr($GLOBALS['TL_DCA']['tl_content']['palettes'][$key],$pos);
+					$palette = substr($palette,0,$pos) . "{tags_legend:hide},tags;" . substr($palette,$pos);
 				}
 			}
 		}
 	}
+	unset($palette);
 
 	$GLOBALS['TL_DCA']['tl_content']['palettes']['headline'] = str_replace('guests','guests,tagsonly', $GLOBALS['TL_DCA']['tl_content']['palettes']['headline']);
 	$GLOBALS['TL_DCA']['tl_content']['config']['ondelete_callback'][] = array('tl_content_tags', 'removeContentElement');
diff --git a/dca/tl_news.php b/dca/tl_news.php
index 2681eeb..08e3914 100644
--- a/dca/tl_news.php
+++ b/dca/tl_news.php
@@ -13,13 +13,14 @@
 
 if (is_array($GLOBALS['TL_DCA']['tl_news']['config']['onload_callback']))
 {
-	foreach ($GLOBALS['TL_DCA']['tl_news']['config']['onload_callback'] as $key => $arr)
+	foreach ($GLOBALS['TL_DCA']['tl_news']['config']['onload_callback'] as $key => &$arr)
 	{
 		if (is_array($arr) && strcmp($arr[0], 'tl_news') == 0 && strcmp($arr[1], 'generateFeed') == 0)
 		{
-			$GLOBALS['TL_DCA']['tl_news']['config']['onload_callback'][$key] = array('TagHelper', 'generateNewsFeed');
+			$arr = array('TagHelper', 'generateNewsFeed');
 		}
 	}
+	unset($arr);
 }
 
 
diff --git a/dca/tl_news_archive.php b/dca/tl_news_archive.php
index ade4ca4..e1bb7dc 100644
--- a/dca/tl_news_archive.php
+++ b/dca/tl_news_archive.php
@@ -10,6 +10,7 @@
 
 if (@class_exists("tl_news_archive"))
 {
+	/*
 	if (is_array($GLOBALS['TL_DCA']['tl_news_archive']['config']['onload_callback']))
 	{
 		foreach ($GLOBALS['TL_DCA']['tl_news_archive']['config']['onload_callback'] as $key => $arr)
@@ -20,6 +21,7 @@
 			}
 		}
 	}
+	*/
 
 }