Fixed Search bug that stopped parsing stops correctly as a result of the refactor
Fixed Search bug that stopped parsing stops correctly as a result of the refactor

bgregg/pvta-multiplatform,bgregg/pvta-multiplatform,bgregg/pvta-multiplatform,bgregg/pvta-multiplatform,bgregg/pvta-multiplatform,bgregg/pvta-multiplatform,bgregg/pvta-multiplatform