Superfecta fails to process all schemes

[gplindstrom]

Using Sangoma Linux release 7.3.1701 (Core) with PHP version 5.6.31 and Freepbx. At least for me, only the first scheme is executed (when ALL is specified) and sets the callerid to blank/null if not found with the lookups in that scheme. Problem appears to be in Superfecta.class.php. When I change the line:
$callerid = $spam_text . " " . $superfecta->get_Prefix() . $callerid;

to:
$callerid = trim($spam_text . " " . $superfecta->get_Prefix() . $callerid);

all seems to work again. For good measure, I also changed the line
$callerid = $spam_text;

to:
$callerid = trim($spam_text);

just in case blanks or something similar are returned in spam_text. This may be an issue (or not) with how older/newer versions of php processed empty. Or maybe it is just a bug.

Thanks!