Checkbox at service discovery

This would be helpful as well but that topic should become an own thread.