Clean up search and filter, filter now shows progress.