Properly detect the end of search for all supported services.
IOS-2369