Update for htmlshark and jsqueue