Revert "Fix periodic thread checking mechanism when waiting for downloads to complete"

This reverts commit 970e6e638a703f06a66d59cf732ecb62e3e32c86.
Fix a couple of issues with searching