diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index 67d688d33..446714bac 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -1215,11 +1215,18 @@ Zotero.CSL.prototype._getFieldValue = function(name, element, item, formattedStr
 		
 		for(var i in element.children) {
 			var child = element.children[i];
+			var string = null;
 			
 			if(child.name == "title") {	// for now, we only care about the
 									// "title" sub-element
 				if(!element.relation) {
-					string = this._getField(item, "title");
+					// preferentially use shortTitle if flagged
+					if(element.form && element.form == "short") {
+						string = this._getField(item, "shortTitle");
+					}
+					if(!string) {
+						string = this._getField(item, "title");
+					}
 				} else if(element.relation == "container") {
 					string = this._getField(item, "publicationTitle");
 				} else if(element.relation == "collection") {
@@ -1424,6 +1431,7 @@ Zotero.CSL.prototype._getFieldValue = function(name, element, item, formattedStr
 			// general prefix and suffix from the element it's substituting for
 			substituteElement.prefix = element.prefix;
 			substituteElement.suffix = element.suffix;
+			substituteElement.form = element.form;
 			// clear substitute element off of the element we're substituting
 			substituteElement.substitute = undefined;
 			
diff --git a/scrapers.sql b/scrapers.sql
index d2860a17d..0a9bf6c87 100644
--- a/scrapers.sql
+++ b/scrapers.sql
@@ -1,4 +1,4 @@
--- 206
+-- 207
 
 --  ***** BEGIN LICENSE BLOCK *****
 --  
@@ -22,7 +22,7 @@
 
 
 -- Set the following timestamp to the most recent scraper update date
-REPLACE INTO version VALUES ('repository', STRFTIME('%s', '2007-03-27 00:43:34'));
+REPLACE INTO version VALUES ('repository', STRFTIME('%s', '2007-03-27 03:18:44'));
 
 REPLACE INTO translators VALUES ('96b9f483-c44d-5784-cdad-ce21b984fe01', '1.0.0b4.r1', '', '2007-03-21 15:26:54', '1', '100', '4', 'Amazon.com', 'Sean Takats', '^https?://(?:www\.)?amazon', 
 'function detectWeb(doc, url) {
@@ -10755,7 +10755,7 @@ function doExport() {
 	}
 }');
 
-REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2007-03-23 19:25:00', 'American Psychological Association',
+REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2007-03-27 03:18:44', 'American Psychological Association',
 '<?xml version="1.0" encoding="UTF-8"?>
 <?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="author-date" xml:lang="en">
@@ -10789,7 +10789,7 @@ REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2007-
         <choose>
           <editor/>
           <translator/>
-          <titles/>
+          <titles quotes="true"/>
         </choose>
       </substitute>
     </author>
@@ -10918,7 +10918,7 @@ REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/apa.csl', '2007-
   </bibliography>
 </style>');
 
-REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-author-date.csl', '2007-03-23 19:25:00', 'Chicago Manual of Style (Author-Date)',
+REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-author-date.csl', '2007-03-27 03:18:44', 'Chicago Manual of Style (Author-Date)',
 '<?xml version="1.0" encoding="UTF-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="author-date" xml:lang="en">
 	<info>
@@ -10944,7 +10944,7 @@ REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-author-dat
 					<editor/>
 					<translator/>
 					<titles relation="container" font-style="italic"/>
-					<titles/>
+					<titles quotes="true"/>
 				</choose>
 			</substitute>
 		</author>
@@ -11247,7 +11247,7 @@ REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/chicago-note.csl
   </citation>
 </style>');
 
-REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-note-bibliography.csl', '2007-03-23 21:30:00', 'Chicago Manual of Style (Note with Bibliography)',
+REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-note-bibliography.csl', '2007-03-27 03:18:44', 'Chicago Manual of Style (Note with Bibliography)',
 '<?xml version="1.0" encoding="UTF-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
 	<info>
@@ -11273,7 +11273,7 @@ REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-note-bibli
 					<editor/>
 					<translator/>
 					<titles relation="container" font-style="italic"/>
-					<titles/>
+					<titles quotes="true"/>
 				</choose>
 			</substitute>
 		</author>
@@ -11419,7 +11419,7 @@ REPLACE INTO csl VALUES('http://www.zotero.org/namespaces/CSL/chicago-note-bibli
 	</bibliography>
 </style>');
 
-REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '2007-03-23 19:25:00', 'Modern Language Association',
+REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '2007-03-27 03:18:44', 'Modern Language Association',
 '<?xml version="1.0" encoding="UTF-8"?>
 <?oxygen RNGSchema="../schema/trunk/csl.rnc" type="compact"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="author" xml:lang="en">
@@ -11450,7 +11450,7 @@ REPLACE INTO csl VALUES('http://purl.org/net/xbiblio/csl/styles/mla.csl', '2007-
       <substitute>
         <choose>
           <editor/>
-          <titles/>
+          <titles quotes="true"/>
         </choose>
       </substitute>
     </author>