Fix a partial search error case; more errors being revealed by testing, have to wait for those to finish to identify what's up