--- a/metadata.douban.com/douban.xml
+++ b/metadata.douban.com/douban.xml
@@ -1,21 +1,26 @@
 ďťż<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2012-04-02">
+<scraper framework="1.1" date="2013-05-21">
+	<NfoUrl dest="3">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;GetUrlByIMDBId&quot;&gt;http://movie.douban.com/j/subject_suggest?q=tt\1&lt;/url&gt;&lt;details&gt;" dest="3">
+			<expression>imdb....?/title/tt([0-9]*)</expression>
+		</RegExp>
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;GetUrlByIMDBId&quot;&gt;http://movie.douban.com/j/subject_suggest?q=tt\1&lt;/url&gt;&lt;details&gt;" dest="3+">
+			<expression>imdb....?/Title\?([0-9]*)</expression>
+		</RegExp>
+	</NfoUrl>
+	<GetUrlByIMDBId dest="3">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.douban.com/v2/movie/subject/\1&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;details&gt;" dest="3">
+			<expression>&quot;url&quot;:&quot;http:\\/\\/movie.douban.com\\/subject\\/([0-9]+)\\/[^&quot;]*&quot;</expression>
+		</RegExp>
+	</GetUrlByIMDBId>
 	<CreateSearchUrl dest="3">
 		<RegExp input="$$1" output="&lt;url&gt;http://movie.douban.com/j/subject_suggest?q=\1&lt;/url&gt;" dest="3">
 			<expression noclean="1"/>
 		</RegExp>
 	</CreateSearchUrl>
-	<NfoUrl dest="3">
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.douban.com/v2/movie/imdb/tt\1&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
-			<expression>imdb....?/title/tt([0-9]*)</expression>
-		</RegExp>
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.douban.com/v2/movie/imdb/tt\1&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
-			<expression>imdb....?/Title\?([0-9]*)</expression>
-		</RegExp>
-	</NfoUrl>
 	<GetSearchResults dest="8">
 		<RegExp input="$$3" output="&lt;results sorted=&quot;yes&quot;&gt;\1&lt;/results&gt;" dest="8">
-			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1 - \3 (\4)&lt;/title&gt;&lt;url&gt;http://api.douban.com/v2/movie/subject/\2&lt;/url&gt;&lt;url&gt;http://movie.douban.com/subject/\2&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/entity&gt;" dest="3+">
+			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1 - \3 (\4)&lt;/title&gt;&lt;url&gt;http://api.douban.com/v2/movie/subject/\2&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/entity&gt;" dest="3+">
 				<expression repeat="yes">&quot;title&quot;:&quot;(.+?)&quot;,&quot;url&quot;:&quot;http:\\/\\/movie.douban.com\\/subject\\/([0-9]+)\\/[^&quot;]*&quot;,&quot;sub_title&quot;:&quot;(.*?)&quot;,&quot;year&quot;:&quot;([0-9]+)&quot;</expression>
 			</RegExp>
 			<expression noclean="1"/>
@@ -23,7 +28,7 @@
 	</GetSearchResults>
 	<GetDetails dest="3">
 		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
-			<RegExp input="$$3" output="&lt;id&gt;\1&lt;/id&gt;" dest="5">
+			<RegExp input="$$2" output="&lt;id&gt;\1&lt;/id&gt;" dest="5">
 				<expression/>
 			</RegExp>
 			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
@@ -65,27 +70,38 @@
 			<RegExp input="$$1" output="\1" dest="8">
 				<expression clear="yes">&quot;casts&quot;:\[(.+?)\]</expression>
 			</RegExp>
-			<RegExp conditional="trailer" input="$$2" output="&lt;trailer&gt;http://movie.douban.com/trailer/video_url?tid=\1&lt;/trailer&gt;" dest="5+">
-				<expression>http://movie.douban.com/trailer/([0-9]+)</expression>
-			</RegExp>
 			<RegExp input="$$8" output="&lt;actor&gt;&lt;thumb&gt;http://\1/img/celebrity/large/\2.jpg&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;/actor&gt;" dest="5+">
 				<expression repeat="yes">&quot;large&quot;:&quot;http:\\/\\/(.+?)\\/img\\/celebrity\\/large\\/(\d+).jpg&quot;.+?&quot;name&quot;:&quot;(.+?)&quot;</expression>
 			</RegExp>
-			<RegExp conditional="movieposterdb" input="$$2" output="&lt;chain function=&quot;GetMoviePosterDBThumbs&quot;&gt;tt\1&lt;/chain&gt;" dest="5+">
-				<expression>http://www.imdb.com/title/tt([0-9]+)</expression>
-			</RegExp>
-			<RegExp input="$$3" output="&lt;url cache=&quot;\1-poster.html&quot; function=&quot;GetPoster&quot;&gt;http://movie.douban.com/subject/\1/photos?type=R&lt;/url&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;url cache=&quot;\1-poster.html&quot; function=&quot;GetPoster&quot;&gt;http://movie.douban.com/subject/\1/photos?type=R&lt;/url&gt;" dest="5+">
 				<expression/>
 			</RegExp>
-			<RegExp conditional="tmdbfanart" input="$$2" output="&lt;chain function=&quot;GetTMDBFanartByIdChain&quot;&gt;tt\1&lt;/chain&gt;" dest="5+">
-				<expression>http://www.imdb.com/title/tt([0-9]+)</expression>
+			<RegExp conditional="!tmdbfanart" input="$$2" output="&lt;url cache=&quot;\1-fanart.html&quot; function=&quot;GetFanart&quot;&gt;http://movie.douban.com/subject/\1/photos?type=S&lt;/url&gt;" dest="5+">
+				<expression/>
 			</RegExp>
-			<RegExp conditional="!tmdbfanart" input="$$3" output="&lt;url cache=&quot;\1-fanart.html&quot; function=&quot;GetFanart&quot;&gt;http://movie.douban.com/subject/\1/photos?type=S&lt;/url&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;url function=&quot;GetDetailsByIMDBId&quot;&gt;http://movie.douban.com/subject/\1&lt;/url&gt;" dest="5+">
 				<expression/>
 			</RegExp>
 			<expression noclean="1"/>
 		</RegExp>
 	</GetDetails>	
+	<GetDetailsByIMDBId dest="5">
+		<RegExp input="$$6" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+			<RegExp conditional="trailer" input="$$1" output="&lt;trailer&gt;http://movie.douban.com/trailer/video_url?tid=\1&lt;/trailer&gt;" dest="6">
+				<expression>http://movie.douban.com/trailer/([0-9]+)</expression>
+			</RegExp>
+			<RegExp input="$$1" output="\1" dest="8">
+				<expression>http://www.imdb.com/title/(tt[0-9]+)</expression>
+			</RegExp>
+			<RegExp conditional="movieposterdb" input="$$8" output="&lt;chain function=&quot;GetMoviePosterDBThumbs&quot;&gt;\1&lt;/chain&gt;" dest="6+">
+				<expression/>
+			</RegExp>
+			<RegExp conditional="tmdbfanart" input="$$8" output="&lt;chain function=&quot;GetTMDBFanartByIdChain&quot;&gt;\1&lt;/chain&gt;" dest="6+">
+				<expression/>
+			</RegExp>
+			<expression noclean="1"/>
+		</RegExp>
+	</GetDetailsByIMDBId>
 	<GetPoster dest="5">
 		<RegExp input="$$6" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<RegExp input="$$1" output="&lt;thumb preview=&quot;\1thumb\2&quot;&gt;\1raw\2&lt;/thumb&gt;" dest="6">