fix alert on search screens
merge alert changes to all search screens