diff --git a/rules/amazon.com.xml b/rules/amazon.com.xml
index 7906c55df4..7bdddc6fce 100644
--- a/rules/amazon.com.xml
+++ b/rules/amazon.com.xml
@@ -1,62 +1,67 @@
 <sitename name="amazon.com">
  <docname name="Amazon.com Privacy Notice">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=468496" xpath="//td[@class='center-col']/div/div[@class='section']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=468496" xpath="//td[@class=&apos;center-col&apos;]/div/div[@class=&apos;section&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Amazon Kindle Store Terms of Use">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=201014950" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=201014950" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Conditions of Use">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=508088" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=508088" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
   <docname name="Kindle for Android Legal Notices">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200495390" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200495390" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Kindle for PC Legal Notices">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200499360" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200499360" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Kindle for Mac Legal Notices">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200443370" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200443370" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="AMAZON SILK TERMS &amp; CONDITIONS">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200775270" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200775270" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Kindle Cloud Reader Legal Notices">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200701450" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200701450" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Kindle for Windows 8 Legal Notices">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200939440" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=200939440" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Amazon App Suite Legal Notices">
-   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=201008370" xpath="//td[@class='center-col']/*[not(@class='cBox secondary') and not(@class='cBox primary')]">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/gp/help/customer/display.html/?ie=UTF8&amp;nodeId=201008370" xpath="//td[@class=&apos;center-col&apos;]/*[not(@class=&apos;cBox secondary&apos;) and not(@class=&apos;cBox primary&apos;)]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Interest-Based Ads">
-   <url name="http://www.amazon.com/b/?&amp;node=5160028011" xpath="//div[@id='centercolatf']/div[@class='unified_widget rcmBody']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/b/?&amp;node=5160028011" xpath="//div[@id=&apos;centercolatf&apos;]/div[@class=&apos;unified_widget rcmBody&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Third Party Licenses">
-   <url name="http://www.amazon.com/b/?&amp;node=200910440" xpath="//div[@id='centercolatf']/div[@class='unified_widget rcmBody']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amazon.com/b/?&amp;node=200910440" xpath="//div[@id=&apos;centercolatf&apos;]/div[@class=&apos;unified_widget rcmBody&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://www.amazon.com/gp/help/customer/display.html/ref=footer_cou/180-0430910-0752712?ie=UTF8&amp;nodeId=508088" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/amtrakconnect.com.xml b/rules/amtrakconnect.com.xml
index 153b589ae9..dcbee8aef6 100644
--- a/rules/amtrakconnect.com.xml
+++ b/rules/amtrakconnect.com.xml
@@ -1,13 +1,17 @@
-
 <sitename name="amtrak.com">
  <docname name="Web Notices and Terms of Use">
-   <url name="http://www.amtrak.com/servlet/ContentServer?c=Page&amp;pagename=am%2FLayout&amp;cid=1241305463068" xpath="//div[@id='content_body']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amtrak.com/servlet/ContentServer?c=Page&amp;pagename=am%2FLayout&amp;cid=1241305463068" xpath="//div[@id=&apos;content_body&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Privacy Policy">
-   <url name="http://www.amtrak.com/servlet/ContentServer?c=Page&amp;pagename=am%2FLayout&amp;cid=1241305463061" xpath="//div[@id='content_body']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.amtrak.com/servlet/ContentServer?c=Page&amp;pagename=am%2FLayout&amp;cid=1241305463061" xpath="//div[@id=&apos;content_body&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://amtrakconnect.com/terms.html" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/answers.com.xml b/rules/answers.com.xml
index 7e00172cdd..215ecb0608 100644
--- a/rules/answers.com.xml
+++ b/rules/answers.com.xml
@@ -1,7 +1,12 @@
 <sitename name="answers.com">
  <docname name="Privacy Policy">
-   <url name="http://wiki.answers.com/about/legal_notices.html#privacy" xpath="//div[@id='main']">
-     <norecurse name="arbitrary"/>
+   <url name="http://wiki.answers.com/about/legal_notices.html#privacy" xpath="//div[@id=&apos;main&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://wiki.answers.com/about/legal_notices.html#terms" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/aol.com.xml b/rules/aol.com.xml
index 2c7f7e1db9..2b1348cfa9 100644
--- a/rules/aol.com.xml
+++ b/rules/aol.com.xml
@@ -1,7 +1,12 @@
 <sitename name="aol.com">
  <docname name="Privacy Policy">
    <url name="http://privacy.aol.com/privacy-policy/">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://legal.aol.com/terms-of-service/full-terms/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/ask.com.xml b/rules/ask.com.xml
index 88225db8a9..90b042e25e 100644
--- a/rules/ask.com.xml
+++ b/rules/ask.com.xml
@@ -1,7 +1,12 @@
 <sitename name="ask.com">
  <docname name="Privacy Policy">
-   <url name="http://www.ask.com/about/legal/privacy?o=0&#x26;l=dir">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.ask.com/about/legal/privacy?o=0&amp;l=dir">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.ask.com/about/legal/terms" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/bl.uk.xml b/rules/bl.uk.xml
index 9ae0d092e7..92c0e3c753 100644
--- a/rules/bl.uk.xml
+++ b/rules/bl.uk.xml
@@ -1,18 +1,22 @@
-
 <sitename name="bl.uk">
  <docname name="Privacy Statement">
-   <url name="http://www.bl.uk/aboutus/terms/privacy/index.html" xpath="//div[@id='maincol']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.bl.uk/aboutus/terms/privacy/index.html" xpath="//div[@id=&apos;maincol&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Copyright and Your use of the British Library Website">
-   <url name="http://www.bl.uk/aboutus/terms/copyright/index.html" xpath="//div[@id='maincol']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.bl.uk/aboutus/terms/copyright/index.html" xpath="//div[@id=&apos;maincol&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Legal Disclaimer">
-   <url name="http://www.bl.uk/aboutus/terms/legal/index.html" xpath="//div[@id='maincol']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.bl.uk/aboutus/terms/legal/index.html" xpath="//div[@id=&apos;maincol&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://www.bl.uk/aboutus/terms/index.html" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/blackboard.com.xml b/rules/blackboard.com.xml
index e462e8426c..17fbaa1279 100644
--- a/rules/blackboard.com.xml
+++ b/rules/blackboard.com.xml
@@ -1,17 +1,22 @@
 <sitename name="blackboard.com">
     <docname name="Security">
-        <url name="https://www.blackboard.com/Footer/Security-Policy.aspx" xpath="//div[@class='Content']/div" lang="EN">
-            <norecurse name="arbitrary"/>
+        <url lang="EN" name="https://www.blackboard.com/Footer/Security-Policy.aspx" xpath="//div[@class=&apos;Content&apos;]/div">
+            <norecurse name="arbitrary" />
         </url>
     </docname>
     <docname name="Privacy Policy">
-        <url name="https://www.blackboard.com/Footer/Privacy-Center.aspx" xpath="//div[@class='editor widget']/div" lang="EN">
-            <norecurse name="arbitrary"/>
+        <url lang="EN" name="https://www.blackboard.com/Footer/Privacy-Center.aspx" xpath="//div[@class=&apos;editor widget&apos;]/div">
+            <norecurse name="arbitrary" />
         </url>
     </docname>
     <docname name="Terms of Use">
-        <url name="https://www.blackboard.com/Footer/Terms-of-Use.aspx" xpath="//div[@class='Content']/div" lang="EN">
-            <norecurse name="arbitrary"/>
+        <url lang="EN" name="https://www.blackboard.com/Footer/Terms-of-Use.aspx" xpath="//div[@class=&apos;Content&apos;]/div">
+            <norecurse name="arbitrary" />
         </url>
     </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://www.blackboard.com/Footer/Terms-of-Use.aspx" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/bloomberg.com.xml b/rules/bloomberg.com.xml
index 831560b4f7..3dc07dba94 100644
--- a/rules/bloomberg.com.xml
+++ b/rules/bloomberg.com.xml
@@ -1,7 +1,12 @@
 <sitename name="bloomberg.com">
  <docname name="Privacy Policy">
    <url name="https://login.bloomberg.com/pages/privacy">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.bloomberg.com/notices/tos.html" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/cnbc.com.xml b/rules/cnbc.com.xml
index e3361df5f5..ac57c1b02b 100644
--- a/rules/cnbc.com.xml
+++ b/rules/cnbc.com.xml
@@ -1,7 +1,12 @@
 <sitename name="cnbc.com">
  <docname name="Privacy Policy">
-   <url name="http://www.cnbc.com/id/100000959/print" xpath="//div[@class='story']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.cnbc.com/id/100000959/print" xpath="//div[@class=&apos;story&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.cnbc.com/id/15837353/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/color.com.xml b/rules/color.com.xml
index b8eda7ee0b..482a19e93c 100644
--- a/rules/color.com.xml
+++ b/rules/color.com.xml
@@ -1,13 +1,17 @@
-
 <sitename name="color.com">
  <docname name="Terms of Service">
-   <url name="http://www.color.com/tos" xpath="//div[@class='content text']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.color.com/tos" xpath="//div[@class=&apos;content text&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Privacy Policy">
-   <url name="http://www.color.com/privacy" xpath="//div[@class='content text']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.color.com/privacy" xpath="//div[@class=&apos;content text&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://www.color.com/#tos" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/comcast.net.xml b/rules/comcast.net.xml
index 9b3002f349..2896e41564 100644
--- a/rules/comcast.net.xml
+++ b/rules/comcast.net.xml
@@ -1,7 +1,12 @@
 <sitename name="comcast.net">
   <docname name="Web Services Privacy Policy">
-    <url name="http://xfinity.comcast.net/privacy/2012-03/" xpath="//div[@class='comes-from-legal']">
-      <norecurse name="arbitrary"/>
+    <url name="http://xfinity.comcast.net/privacy/2012-03/" xpath="//div[@class=&apos;comes-from-legal&apos;]">
+      <norecurse name="arbitrary" />
     </url>
   </docname>
+<docname name="Terms of Service">   
+   <url name="http://xfinity.comcast.net/terms/web/" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/consumerist.com.xml b/rules/consumerist.com.xml
index a6f4a42984..2a37e8a4ef 100644
--- a/rules/consumerist.com.xml
+++ b/rules/consumerist.com.xml
@@ -1,7 +1,12 @@
 <sitename name="consumerist.com">
  <docname name="Privacy Policy">
-   <url name="http://consumerist.com/privacy-policy/" xpath="//div[@class='post-77 page type-page status-publish hentry']">
-     <norecurse name="arbitrary"/>
+   <url name="http://consumerist.com/privacy-policy/" xpath="//div[@class=&apos;post-77 page type-page status-publish hentry&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://consumerist.com/user-agreement/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/delicious.com.xml b/rules/delicious.com.xml
index 7ed0927404..2eed1f8fa6 100644
--- a/rules/delicious.com.xml
+++ b/rules/delicious.com.xml
@@ -1,12 +1,17 @@
 <sitename name="delicious.com">
  <docname name="Privacy Policy">
-   <url name="http://delicious.com/privacy" xpath="//div[@id='content']/div[@class='body']">
-     <norecurse name="arbitrary"/>
+   <url name="http://delicious.com/privacy" xpath="//div[@id=&apos;content&apos;]/div[@class=&apos;body&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Terms of Service">
-   <url name="http://delicious.com/terms" xpath="//div[@id='content']/div[@class='body']">
-     <norecurse name="arbitrary"/>
+   <url name="http://delicious.com/terms" xpath="//div[@id=&apos;content&apos;]/div[@class=&apos;body&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.delicious.com/help/terms" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/deviantart.com.xml b/rules/deviantart.com.xml
index 8cc9348299..ea53c0bc1a 100644
--- a/rules/deviantart.com.xml
+++ b/rules/deviantart.com.xml
@@ -1,7 +1,12 @@
 <sitename name="deviantart.com">
  <docname name="Privacy Policy">
-   <url name="http://about.deviantart.com/policy/privacy/" xpath="//div[@id='policy-privacy']">
-     <norecurse name="arbitrary"/>
+   <url name="http://about.deviantart.com/policy/privacy/" xpath="//div[@id=&apos;policy-privacy&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://about.deviantart.com/policy/service/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/disqus.com.xml b/rules/disqus.com.xml
index dfebff3560..bd179943dd 100644
--- a/rules/disqus.com.xml
+++ b/rules/disqus.com.xml
@@ -1,13 +1,17 @@
-
 <sitename name="disqus.com">
  <docname name="Terms of Service">
-   <url name="http://help.disqus.com/customer/portal/articles/466260-terms-of-service" xpath="//div[@id='support-main']/div[@class='article-content']">
-     <norecurse name="arbitrary"/>
+   <url name="http://help.disqus.com/customer/portal/articles/466260-terms-of-service" xpath="//div[@id=&apos;support-main&apos;]/div[@class=&apos;article-content&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Privacy Policy">
-   <url name="http://help.disqus.com/customer/portal/articles/466259-privacy-policy" xpath="//div[@id='support-main']/div[@class='article-content']">
-     <norecurse name="arbitrary"/>
+   <url name="http://help.disqus.com/customer/portal/articles/466259-privacy-policy" xpath="//div[@id=&apos;support-main&apos;]/div[@class=&apos;article-content&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://docs.disqus.com/help/29/" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/ebay.com.xml b/rules/ebay.com.xml
index 4ebb29c910..d7f84326f0 100644
--- a/rules/ebay.com.xml
+++ b/rules/ebay.com.xml
@@ -1,7 +1,12 @@
 <sitename name="ebay.com">
  <docname name="Privacy Policy">
-   <url name="http://pages.ebay.com/help/policies/privacy-policy.html?rt=nc" xpath="//div[@class='HelpContent']">
-     <norecurse name="arbitrary"/>
+   <url name="http://pages.ebay.com/help/policies/privacy-policy.html?rt=nc" xpath="//div[@class=&apos;HelpContent&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://pages.ebay.com/help/policies/user-agreement.html?rt=nc" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/ehow.com.xml b/rules/ehow.com.xml
index 5c64a13c92..63f24c70f2 100644
--- a/rules/ehow.com.xml
+++ b/rules/ehow.com.xml
@@ -1,7 +1,12 @@
 <sitename name="ehow.com">
  <docname name="Privacy Policy">
-   <url name="http://www.ehow.com/privacy.html" xpath="//section[@id='Body']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.ehow.com/privacy.html" xpath="//section[@id=&apos;Body&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.ehow.com/terms-of-use.html" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/experiandirect.com.xml b/rules/experiandirect.com.xml
index ab4b467ee4..ccd928df97 100644
--- a/rules/experiandirect.com.xml
+++ b/rules/experiandirect.com.xml
@@ -1,8 +1,12 @@
-
 <sitename name="experiandirect.com">
  <docname name="Terms of Service">
-   <url name="https://www.experiandirect.com/triplealert/Message.aspx?PageTypeID=TermsConditions" xpath="//div[@id='TandC_page']">
-     <norecurse name="arbitrary"/>
+   <url name="https://www.experiandirect.com/triplealert/Message.aspx?PageTypeID=TermsConditions" xpath="//div[@id=&apos;TandC_page&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="https://creditcheck.experiandirect.com/autoselect/Message.aspx?PageTypeID=TermsConditions" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/foxnews.com.xml b/rules/foxnews.com.xml
index 2213d54b76..4bdec56a7b 100644
--- a/rules/foxnews.com.xml
+++ b/rules/foxnews.com.xml
@@ -1,7 +1,12 @@
 <sitename name="foxnews.com">
  <docname name="Privacy Policy">
    <url name="http://www.foxnews.com/about/privacy-policy/">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.foxnews.com/about/terms-of-use/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/freefilefillableforms.com.xml b/rules/freefilefillableforms.com.xml
index 95e9241452..a025ba05c6 100644
--- a/rules/freefilefillableforms.com.xml
+++ b/rules/freefilefillableforms.com.xml
@@ -1,8 +1,12 @@
-
 <sitename name="freefilefillableforms.com">
  <docname name="Terms of Service">
-   <url name="https://www.freefilefillableforms.com/fff/html/Terms_of_Service/FED.htm" xpath='/'>
-     <norecurse name="arbitrary"/>
+   <url name="https://www.freefilefillableforms.com/fff/html/Terms_of_Service/FED.htm" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="https://www.freefilefillableforms.com/FFA/Terms_of_Service/FED.htm" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/go.com.xml b/rules/go.com.xml
index fb6ddcdcab..77e14e8a50 100644
--- a/rules/go.com.xml
+++ b/rules/go.com.xml
@@ -1,7 +1,12 @@
 <sitename name="go.com">
  <docname name="Privacy Policy">
    <url name="http://corporate.disney.go.com/corporate/pp.html">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://corporate.disney.go.com/corporate/terms.html" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/google.com.xml b/rules/google.com.xml
index df00e4a3b7..0d061ca711 100644
--- a/rules/google.com.xml
+++ b/rules/google.com.xml
@@ -1,12 +1,21 @@
 <sitename name="google.com">
  <docname name="Privacy Policy">
    <url name="https://www.google.com/intl/en/policies/privacy/">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Terms of Service">
    <url name="https://www.google.com/intl/en/policies/terms/">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="https://www.google.com/intl/en/analytics/tos.html" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname><docname name="Terms of Service">   
+   <url name="https://code.google.com/projecthosting/terms.html" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/huffingtonpost.com.xml b/rules/huffingtonpost.com.xml
index fa648a2f48..9f7f9f7b77 100644
--- a/rules/huffingtonpost.com.xml
+++ b/rules/huffingtonpost.com.xml
@@ -1,7 +1,12 @@
 <sitename name="huffingtonpost.com">
  <docname name="Privacy Policy">
-   <url name="http://www.huffingtonpost.com/privacy/" xpath="//div[@id='privacy-policy']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.huffingtonpost.com/privacy/" xpath="//div[@id=&apos;privacy-policy&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.huffingtonpost.com/terms.html" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/imageshack.us.xml b/rules/imageshack.us.xml
index fa313ec2bc..7fc21e1ac1 100644
--- a/rules/imageshack.us.xml
+++ b/rules/imageshack.us.xml
@@ -1,7 +1,12 @@
 <sitename name="imageshack.us">
  <docname name="Privacy Policy">
-   <url name="http://imageshack.us/p/rules/" xpath="//div[@id='container']">
-     <norecurse name="arbitrary"/>
+   <url name="http://imageshack.us/p/rules/" xpath="//div[@id=&apos;container&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://imageshack.us/content.php?page=rules" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/imdb.com.xml b/rules/imdb.com.xml
index d4a091949d..51b1b173fa 100644
--- a/rules/imdb.com.xml
+++ b/rules/imdb.com.xml
@@ -1,7 +1,12 @@
 <sitename name="imdb.com">
  <docname name="Privacy Policy">
-   <url name="http://www.imdb.com/privacy" xpath="//div[@id='pagecontent']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.imdb.com/privacy" xpath="//div[@id=&apos;pagecontent&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.imdb.com/help/show_article?conditions" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/latimes.com.xml b/rules/latimes.com.xml
index fd8f3b1266..619e322de3 100644
--- a/rules/latimes.com.xml
+++ b/rules/latimes.com.xml
@@ -1,7 +1,12 @@
 <sitename name="latimes.com">
  <docname name="Privacy Policy">
    <url name="http://privacy.tribune.com/">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.latimes.com/services/site/lat-terms,0,5102799,full.story" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/linkedin.com.xml b/rules/linkedin.com.xml
index 55422202fd..1f50cc0c64 100644
--- a/rules/linkedin.com.xml
+++ b/rules/linkedin.com.xml
@@ -1,7 +1,12 @@
 <sitename name="linkedin.com">
  <docname name="Privacy Policy">
-   <url name="http://www.linkedin.com/static?key=privacy_policy&amp;trk=hb_ft_priv" xpath="//div[@class='contain']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.linkedin.com/static?key=privacy_policy&amp;trk=hb_ft_priv" xpath="//div[@class=&apos;contain&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.linkedin.com/static?key=user_agreement" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/live.com.xml b/rules/live.com.xml
index 71aa7c6f47..9d3ed5882f 100644
--- a/rules/live.com.xml
+++ b/rules/live.com.xml
@@ -1,7 +1,12 @@
 <sitename name="live.com">
  <docname name="Privacy Policy">
    <url name="http://privacy.microsoft.com/en-us/fullnotice.mspx">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://explore.live.com/microsoft-service-agreement?ref=none&amp;mkt=en-us" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/livejournal.com.xml b/rules/livejournal.com.xml
index 8f3de7337a..d9e572f688 100644
--- a/rules/livejournal.com.xml
+++ b/rules/livejournal.com.xml
@@ -1,7 +1,12 @@
 <sitename name="livejournal.com">
  <docname name="Privacy Policy">
-   <url name="http://www.livejournal.com/legal/privacy.bml" xpath="//div[@id='content-wrapper']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.livejournal.com/legal/privacy.bml" xpath="//div[@id=&apos;content-wrapper&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.livejournal.com/legal/tos.bml" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/microsoft.com.xml b/rules/microsoft.com.xml
index 3e022e16df..2e6ee97833 100644
--- a/rules/microsoft.com.xml
+++ b/rules/microsoft.com.xml
@@ -1,7 +1,12 @@
 <sitename name="microsoft.com">
  <docname name="Privacy Policy">
    <url name="http://privacy.microsoft.com/en-us/fullnotice.mspx">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://windows.microsoft.com/en-US/windows-live/microsoft-service-agreement" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/msn.com.xml b/rules/msn.com.xml
index c59134e421..8ad2d46f6b 100644
--- a/rules/msn.com.xml
+++ b/rules/msn.com.xml
@@ -1,7 +1,12 @@
 <sitename name="msn.com">
  <docname name="Privacy Policy">
    <url name="http://privacy.microsoft.com/en-us/fullnotice.mspx ">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.msnbc.msn.com/id/3303540/ns/about/t/terms-conditions/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/myspace.com.xml b/rules/myspace.com.xml
index a253eada98..8a992d2b05 100644
--- a/rules/myspace.com.xml
+++ b/rules/myspace.com.xml
@@ -1,7 +1,12 @@
 <sitename name="myspace.com">
  <docname name="Privacy Policy">
-   <url name="http://www.myspace.com/Help/Privacy?pm_cmp=ed_footer" xpath="//section[@id='col0_0']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.myspace.com/Help/Privacy?pm_cmp=ed_footer" xpath="//section[@id=&apos;col0_0&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.myspace.com/Help/Terms" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/nationalgeographic.com.xml b/rules/nationalgeographic.com.xml
index 7b4bf60caa..af8b2102e0 100644
--- a/rules/nationalgeographic.com.xml
+++ b/rules/nationalgeographic.com.xml
@@ -1,7 +1,12 @@
 <sitename name="nationalgeographic.com">
  <docname name="Privacy Policy">
    <url name="http://www.nationalgeographic.com/community/privacy_complete.html">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.nationalgeographic.com/community/terms/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/ning.com.xml b/rules/ning.com.xml
index b232d6cdca..f5448c8466 100644
--- a/rules/ning.com.xml
+++ b/rules/ning.com.xml
@@ -1,7 +1,12 @@
 <sitename name="ning.com">
  <docname name="Privacy Policy">
-   <url name="http://www.ning.com/about/legal/privacy/" xpath="//div[@id='entry-37']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.ning.com/about/legal/privacy/" xpath="//div[@id=&apos;entry-37&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://about.ning.com/legal/tos.php" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/pinterest.com.xml b/rules/pinterest.com.xml
index 3d7a88f283..28589b05b1 100644
--- a/rules/pinterest.com.xml
+++ b/rules/pinterest.com.xml
@@ -1,7 +1,12 @@
 <sitename name="pinterest.com">
  <docname name="Privacy Policy">
-   <url name="http://pinterest.com/about/privacy/" xpath="//div[@id='legal']">
-     <norecurse name="arbitrary"/>
+   <url name="http://pinterest.com/about/privacy/" xpath="//div[@id=&apos;legal&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://pinterest.com/about/terms/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/reddit.com.xml b/rules/reddit.com.xml
index 0fcc6eac37..762f039c18 100644
--- a/rules/reddit.com.xml
+++ b/rules/reddit.com.xml
@@ -1,7 +1,12 @@
 <sitename name="reddit.com">
  <docname name="Privacy Policy">
-   <url name="http://www.reddit.com/help/privacypolicy" xpath="//div[@id='content']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.reddit.com/help/privacypolicy" xpath="//div[@id=&apos;content&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.reddit.com/help/useragreement" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/scienceblogs.com.xml b/rules/scienceblogs.com.xml
index d80e76c0e5..c115fd914a 100644
--- a/rules/scienceblogs.com.xml
+++ b/rules/scienceblogs.com.xml
@@ -1,8 +1,12 @@
-
 <sitename name="scienceblogs.com">
  <docname name="Terms of Service">
-   <url name="http://scienceblogs.com/terms-conditions/" xpath="//div[@class='main']">
-     <norecurse name="arbitrary"/>
+   <url name="http://scienceblogs.com/terms-conditions/" xpath="//div[@class=&apos;main&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://scienceblogs.com/main/terms/" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/slate.com.xml b/rules/slate.com.xml
index 094b320292..1d45f7bb1b 100644
--- a/rules/slate.com.xml
+++ b/rules/slate.com.xml
@@ -1,7 +1,12 @@
 <sitename name="slate.com">
  <docname name="Privacy Policy">
-   <url name="http://www.slate.com/articles/briefing/slate_user_agreement_and_privacy_policy/2005/01/_2.single.html" xpath="//div[@class='body parsys']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.slate.com/articles/briefing/slate_user_agreement_and_privacy_policy/2005/01/_2.single.html" xpath="//div[@class=&apos;body parsys&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.slate.com/id/2111949/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/sourceforge.net.xml b/rules/sourceforge.net.xml
index 3550d33005..5ffed2ff2c 100644
--- a/rules/sourceforge.net.xml
+++ b/rules/sourceforge.net.xml
@@ -1,7 +1,12 @@
 <sitename name="sourceforge.net">
  <docname name="Privacy Policy">
-   <url name="http://geeknetmedia.com/privacy-statement/" xpath="//article[@id='post-719']">
-     <norecurse name="arbitrary"/>
+   <url name="http://geeknetmedia.com/privacy-statement/" xpath="//article[@id=&apos;post-719&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://sourceforge.net/apps/trac/sitelegal/wiki/Terms_of_Use" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/starbucks.com.xml b/rules/starbucks.com.xml
index 636073b283..5fe56a0932 100644
--- a/rules/starbucks.com.xml
+++ b/rules/starbucks.com.xml
@@ -1,7 +1,12 @@
 <sitename name="starbucks.com">
  <docname name="Privacy Policy">
-   <url name="http://www.starbucks.com/about-us/company-information/online-policies/privacy-policy" xpath="//div[@class='region size2of3']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.starbucks.com/about-us/company-information/online-policies/privacy-policy" xpath="//div[@class=&apos;region size2of3&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.starbucks.com/about-us/company-information/online-policies/terms-of-use" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/statefarm.com.xml b/rules/statefarm.com.xml
index 9c8205cee6..f20e1f3926 100644
--- a/rules/statefarm.com.xml
+++ b/rules/statefarm.com.xml
@@ -1,7 +1,12 @@
 <sitename name="statefarm.com">
  <docname name="Privacy Policy">
    <url name="http://www.statefarm.com/about/privacy/privacy.asp?WT.svl=82">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.statefarm.com/about/terms/terms.asp" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/tumblr.com.xml b/rules/tumblr.com.xml
index 8b27a907ee..e82f9a8e37 100644
--- a/rules/tumblr.com.xml
+++ b/rules/tumblr.com.xml
@@ -1,7 +1,12 @@
 <sitename name="tumblr.com">
  <docname name="Privacy Policy">
-   <url name="http://www.tumblr.com/policy/en/privacy" xpath="//div[@id='left_column']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.tumblr.com/policy/en/privacy" xpath="//div[@id=&apos;left_column&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.tumblr.com/policy/en/terms_of_service" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/twitpic.com.xml b/rules/twitpic.com.xml
index 40a4a9316a..50f22f2768 100644
--- a/rules/twitpic.com.xml
+++ b/rules/twitpic.com.xml
@@ -1,12 +1,17 @@
 <sitename name="twitpic.com">
  <docname name="Privacy Policy">
    <url name="http://twitpic.com/privacy.do">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
    </url>
  </docname> 
  <docname name="Terms of Service">
    <url name="http://twitpic.com/terms.do">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="https://twitpic.com/terms.do" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file
diff --git a/rules/twitter.com.xml b/rules/twitter.com.xml
index b567745f44..bef0642e81 100644
--- a/rules/twitter.com.xml
+++ b/rules/twitter.com.xml
@@ -1,12 +1,17 @@
 <sitename name="twitter.com">
  <docname name="Privacy Policy">
-   <url name="http://twitter.com/privacy" xpath="//div[@id='pageContent']">
-     <norecurse name="arbitrary"/>
+   <url name="http://twitter.com/privacy" xpath="//div[@id=&apos;pageContent&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
  <docname name="Terms of Service">
-   <url name="http://twitter.com/tos" xpath="//div[@id='pageContent']">
-     <norecurse name="arbitrary"/>
+   <url name="http://twitter.com/tos" xpath="//div[@id=&apos;pageContent&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="https://twitter.com/tos/" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/typepad.com.xml b/rules/typepad.com.xml
index ad463c892a..cc780b7313 100644
--- a/rules/typepad.com.xml
+++ b/rules/typepad.com.xml
@@ -1,7 +1,12 @@
 <sitename name="typepad.com">
  <docname name="Privacy Policy">
    <url name="http://www.typepad.com/legal/privacy.html">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.typepad.com/legal/terms-of-service.html" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/usatoday.com.xml b/rules/usatoday.com.xml
index 095d4b8af1..a622cab21d 100644
--- a/rules/usatoday.com.xml
+++ b/rules/usatoday.com.xml
@@ -1,7 +1,12 @@
 <sitename name="usatoday.com">
  <docname name="Privacy Policy">
    <url name="http://www.usatoday.com/marketing/privacy-notice.htm">
-     <norecurse name="arbitrary"/>
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.usatoday.com/marketing/tos.htm" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/vimeo.com.xml b/rules/vimeo.com.xml
index b1b8aba019..6ffac2a7bb 100644
--- a/rules/vimeo.com.xml
+++ b/rules/vimeo.com.xml
@@ -1,7 +1,12 @@
 <sitename name="vimeo.com">
  <docname name="Privacy Policy">
-   <url name="http://vimeo.com/privacy" xpath="//div[@id='legal_doc']">
-     <norecurse name="arbitrary"/>
+   <url name="http://vimeo.com/privacy" xpath="//div[@id=&apos;legal_doc&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://vimeo.com/terms" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/yahoo.com.xml b/rules/yahoo.com.xml
index 3e8a7e61de..92c05169f2 100644
--- a/rules/yahoo.com.xml
+++ b/rules/yahoo.com.xml
@@ -1,11 +1,16 @@
 <sitename name="yahoo.com">
  <docname name="Terms of Service">
-  <url name="http://info.yahoo.com/legal/us/yahoo/utos/terms/" xpath="//div[@id='rb']">
+  <url name="http://info.yahoo.com/legal/us/yahoo/utos/terms/" xpath="//div[@id=&apos;rb&apos;]">
   </url>
  </docname>
  <docname name="Privacy Policy">
-   <url name="http://info.yahoo.com/privacy/us/yahoo/details.html" xpath="//div[@id='pp-content1']">
-     <norecurse name="arbitrary"/>
+   <url name="http://info.yahoo.com/privacy/us/yahoo/details.html" xpath="//div[@id=&apos;pp-content1&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://info.yahoo.com/legal/us/yahoo/utos/utos-173.html" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/yelp.com.xml b/rules/yelp.com.xml
index 543fef7255..043eac8d66 100644
--- a/rules/yelp.com.xml
+++ b/rules/yelp.com.xml
@@ -1,7 +1,12 @@
 <sitename name="yelp.com">
  <docname name="Privacy Policy">
-   <url name="http://www.yelp.com/static?p=privacy&#x26;country=US" xpath="//div[@id='super-container']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.yelp.com/static?p=privacy&amp;country=US" xpath="//div[@id=&apos;super-container&apos;]">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+<docname name="Terms of Service">   
+   <url name="http://www.yelp.com/static?p=tos" xpath="/">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
 </sitename>
\ No newline at end of file
diff --git a/rules/zendesk.com.xml b/rules/zendesk.com.xml
index 88bdb34668..9372f020f1 100644
--- a/rules/zendesk.com.xml
+++ b/rules/zendesk.com.xml
@@ -1,7 +1,12 @@
 <sitename name="zendesk.com">
  <docname name="Terms of Service">
-   <url name="http://www.zendesk.com/company/terms" xpath="//div[@id='content']">
-     <norecurse name="arbitrary"/>
+   <url name="http://www.zendesk.com/company/terms" xpath="//div[@id=&apos;content&apos;]">
+     <norecurse name="arbitrary" />
    </url>
  </docname>
-</sitename>
+<docname name="Terms of Service">   
+   <url name="http://lockerz.zendesk.com/entries/515604-terms-of-service" xpath="/">
+     <norecurse name="arbitrary" />
+   </url>
+ </docname>
+</sitename>
\ No newline at end of file