Fix for search results being overwritten by current folder updates