Sujit: Moving over the changes from "features/search" branch and fix for download progress event not having the correct fileId