make choosing a service as a target work again