General cleanup, fixed bug in option terms where old tpl was used for ajax add term calls.