Update after tag-logic clarification.