Handle more services and empty results
Handle more services and empty results

annegentle/fairy-slipper,annegentle/fairy-slipper,russell/fairy-slipper,annegentle/fairy-slipper,russell/fairy-slipper,russell/fairy-slipper,annegentle/fairy-slipper,russell/fairy-slipper