fixed support for domains, tokens and terms