Issue #77 - Fix issues from merging search branch 

@wilbertom - I think I've addressed everything - does this work for you locally now?  I don't have the same data set as you so I don't know if any errors will be triggered by certain data sets.

I also took care of a couple of cleanup items that I noticed while working on this stuff.