added terms lookup support