Added skipping of safe html blocks