diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index 57fc222c6..40e02a380 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -283,9 +283,19 @@
 	  </group>
 	</else>
       </choose>
+	<choose>
+	  <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+	<group delimiter=". ">
 	  <text variable="archive_location" text-case="title"/>
 	  <text macro="archive"/>
-      <text macro="access"/>
+	</group>
+	  </if>
+	</choose>
+	<choose>
+	  <if variable="page" match="none">
+      <text variable="URL"/>
+	  </if>
+	</choose>
 	  </group>
     </layout>
   </bibliography>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index 63b873e1a..e48af75c2 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -294,11 +294,19 @@
 	<text variable="locator" prefix=", "/>
 	  </else>
 	</choose>
+	<choose>
+	  <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
 	<group prefix=", " delimiter=", ">
 	  <text variable="archive_location"/>
 	  <text macro="archive"/>
-      <text macro="access"/>
 	</group>
+	  </if>
+	</choose>
+	<choose>
+	  <if variable="page" match="none">
+      <text variable="URL" prefix=", "/>
+	  </if>
+	</choose>
 	  </else>
 	</choose>
     </layout>