html tag improvements

Better compatibility
Merge branch 'master' into static