Tag set fix

This is the performance fix, without all the other commits =)