More improvements to htmlbars