Actually untag things

In other news, I learned how the ternary operator works. Teaches me to copy paste code.