Added a handler so that it can be used in supermodels.
Fixed terms list setup.