Alert Rule for Device Groups and Services

I am trying to set up a rule to monitor both a service (fping to gateway for monitoring the modem) and a device (firewall and/or switches) contained in a device group.

This is how I currently have the rule set up.

The alert rule was working for the device contained in the device group when I first set up the rule. The moment I added the ‘or’ statement and the parameters for the service, the rule no longer notified about devices, just the service.

Are there any recommendations on how to alter this rule so it will notify me for both the service and the device?