Fix more places where tags weren't respected correctly