Added missing tag switches