diff --git a/src/chrome/content/rules/aastocks.com.xml b/src/chrome/content/rules/aastocks.com.xml
index 1817837a7748..87c88bca396b 100644
--- a/src/chrome/content/rules/aastocks.com.xml
+++ b/src/chrome/content/rules/aastocks.com.xml
@@ -10,16 +10,12 @@
 			 - stanjson.aastocks.com
 			 - stanjson-uat.aastocks.com
 
-		Couldn't resolve host name:
-			 - sccharts.aastocks.com
-			 - sccharts-uat.aastocks.com
-			 - standardchartered.aastocks.com
-			 - standardchartered-uat.aastocks.com
-
-		Couldn't connect to server:
-			 - mail.cn.aastocks.com
-			 - smtp.cn.aastocks.com
-			 - smtp1.cn.aastocks.com
+		Connection refused:
+			 - fpdata.aastocks.com
+			 - fxcharts.aastocks.com
+			 - hkg.aastocks.com
+			 - hkg1.aastocks.com
+			 - m.aastocks.com
 
 		Timeout was reached:
 			 - bb.aastocks.com
@@ -32,8 +28,6 @@
 			 - fund.aastocks.com
 			 - fx.aastocks.com
 			 - payment.aastocks.com
-			 - smtp.aastocks.com
-			 - smtp2.aastocks.com
 			 - tldata.aastocks.com
 			 - ws2.aastocks.com
 			 - wss-uat.aastocks.com
@@ -80,7 +74,17 @@
 -->
 <ruleset name="AASTOCKS.com (partial)">
 	<target host="www.aastocks.com" />
+	<!-- 
+		On Firefox, enforcing HTTPS on the homepages will break the "Real-time
+		Latest Quote" functionalities because the Access-Control-Allow-Origin
+		header requiring HTTP. This bug does not affect Chromium browser (by 
+		default) or Firefox in HTTP Nowhere mode (#15606)
+	-->
+	<exclusion pattern="^http://www\.aastocks\.com/(tc|sc|en)/$" />
 	<exclusion pattern="^http://www\.aastocks\.com/(tc|sc|en)/.+\.as[hp]x" />
+	<test url="http://www.aastocks.com/sc/" />
+	<test url="http://www.aastocks.com/tc/" />
+	<test url="http://www.aastocks.com/en/" />
 	<test url="http://www.aastocks.com/sc/default.aspx" />
 	<test url="http://www.aastocks.com/tc/ltp/rtquote.aspx?symbol=00005" />
 	<test url="http://www.aastocks.com/en/stocks/quote/detail-quote.aspx?symbol=02822" />
@@ -96,11 +100,11 @@
 	<target host="fcadata.aastocks.com" />
 	<target host="fcsdata.aastocks.com" />
 	<target host="fctdata.aastocks.com" />
-	<target host="fpdata.aastocks.com" />
-	<target host="fxcharts.aastocks.com" />
 	<target host="chartdata1.internet.aastocks.com" />
 	
 	<target host="hkg.aastocks.com" />
+	<test url="http://hkg.aastocks.com/cms/commentary/commentator_photo_chi_17.jpg" />
+	<test url="http://hkg.aastocks.com/cms/commentary/commentator_photo_chi_76.png" />
 	<target host="hkg1.aastocks.com" />
 	<target host="hkg3.aastocks.com" />
 	<target host="hkg8.aastocks.com" />
@@ -112,7 +116,7 @@
 	<target host="logon.aastocks.com" />
 	<test url="http://logon.aastocks.com/payment/tc/termsconditions.aspx" />
 	
-	<target host="m.aastocks.com" />
+	<!-- target host="m.aastocks.com" / -->
 	<target host="mpdata.aastocks.com" />
 	
 	<target host="plib.aastocks.com" />
@@ -141,7 +145,11 @@
 	<securecookie host="hkg8\.aastocks\.com" name=".+" />
 
 	<securecookie host="logon\.aastocks\.com" name=".+" />
-	<securecookie host="secure\.aastocks.com" name=".+" />
+	<securecookie host="secure\.aastocks\.com" name=".+" />
 
-	<rule from="^http:" to="https:" />
+	<rule from="^http://hkg1?\.aastocks\.com/"
+		  	to="https://hkg3.aastocks.com/" />
+	
+	<rule from="^http:" 
+		  	to="https:" />
 </ruleset>