updates for compatibility with ot-base and a bug fix in SingleNamePrefixQuery