tweak for BBC
Merge branch 'fix-noscript' into fix-bbc-nocss
tweak test result
Merge branch 'fix-bbc-nocss' into smallrivers