Making sure the tag shows up on play. Also fixing highlight on final.