diff --git a/modules/aggregator.module b/modules/aggregator.module
index 73339b57200..05f42a7b387 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -178,7 +178,7 @@ function aggregator_remove($feed) {
     db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items));
   }
   db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
-  db_query('UPDATE {aggregator_feed} SET checked = 0 WHERE fid = %d', $feed['fid']);
+  db_query('UPDATE {aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d', $feed['fid']);
   drupal_set_message(t('removed news items from \'%site\'.', array('%site' => $feed['title'])));
 }
 
@@ -332,7 +332,7 @@ function aggregator_parse_feed(&$data, $feed) {
   xml_parser_free($xml_parser);
 
   // initialize the translation table:
-  $tt = array_flip(get_html_translation_table(HTML_ENTITIES));
+  $tt = array_flip(get_html_translation_table(HTML_SPECIALCHARS));
   $tt["'"] = "'";
 
   /*
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 73339b57200..05f42a7b387 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -178,7 +178,7 @@ function aggregator_remove($feed) {
     db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items));
   }
   db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
-  db_query('UPDATE {aggregator_feed} SET checked = 0 WHERE fid = %d', $feed['fid']);
+  db_query('UPDATE {aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d', $feed['fid']);
   drupal_set_message(t('removed news items from \'%site\'.', array('%site' => $feed['title'])));
 }
 
@@ -332,7 +332,7 @@ function aggregator_parse_feed(&$data, $feed) {
   xml_parser_free($xml_parser);
 
   // initialize the translation table:
-  $tt = array_flip(get_html_translation_table(HTML_ENTITIES));
+  $tt = array_flip(get_html_translation_table(HTML_SPECIALCHARS));
   $tt["'"] = "'";
 
   /*