minor
Add soterm prefixing
Fix lookup