Complete search on stop if necessary

Closes #5