fix contextTags not persisting bug