Further improvements in tag handling and rendering