WL-2351 Term sort moved to function and improved
WL-2351 Fix for signups over several terms