[3.8] Fix patch migration && advanced search issues