filter tokens no longer need to be built late, since config.database is not filtered in
filter tokens no longer need to be built late, since config.database is not filtered in

NCIP/psc,NCIP/psc,NCIP/psc,NCIP/psc