Merge pull request #598 from theresaanna/master

TOC reg version vs search results
fixing null bug and another random inconsequential error
build