Merged changes plus encoding fix

Merged changes from main repo plus a fix in opsourcemethod as the second
page of responses threw utf encoding errors.