TagsPerformance enhancement