Availability Map not sorting by Device Group properly

I recently created a dashboard to use with a particular device group. I filtered the Availability Map to display devices and services from the device group. It is displaying devices from that group, but it is also displaying some services from devices that are not a part of that group. The devices for the desired group, in fact, do not have any monitored services (snmp only). Futhermore, if I add a service check to one of the devices in the group, it does not appear on the Availability Map.

I have the same issue.

I think the issue is in here somewhere: https://github.com/librenms/librenms/blob/master/includes/html/common/availability-map.inc.php

In how it handles device groups but doesn’t seem to for searching for related services.

Looks like line 189 takes into account the device group but then for services starting on line 263 it does not. Can any developers lend a hand here?