Fix language persistence between views