fixes for tag parse