improve old-tokens-attr handling