Tag engine modifications