Adding language tags more uniformly