fix for GO_REF terms plus with/from fields
update
Merge pull request #201 from tcarver/master

misc