tag set performance fix