Fix html tag issues