[Finishes #48701691] Fix selection logic in create_service