#255 more improvements to html filter