Improved html checking to be reliable
Merge branch 'master' into kue