Async fixes:
1) Fixing deadlock for the searching
2) Only highlight appropriate strings
3) Fix for the background task persisting
Minor updates to make super large syncs more reliable and help issue detection
Fix for bad merge