fixes for tag subs