update for multi term support