Tags performance improvement