Tweaked st-query
Merged normalize-html code