Add SHORT_TITLE and TERM tokens