Improved HTML filter performance
Misc. cleanups