Additional updates and fixes to the Search Suggestions rebase