Partial fix on language tag