focus on tag switch improvement