Using device groups for dashboards and alerts

I cant seem to correctly target device groups in the dashboard or alerts. What I’m trying to do is:

Create the following groups:

GroupA-webservers
GroupA-database servers
GroupA-file servers
GroupA-all servers

GroupB-webservers
GroupB-database servers
GroupB-file servers
GroupB-all servers

GroupC-webservers
GroupC-database servers
GroupC-file servers
GroupC-all servers

I would like to create dashboards for GroupA, GroupB, and GroupC to focus on just those system and the services on those systems. What I am seeing is that if I add the Availability Map widget to the dashboard and leave the device group in settings as All Devices, all devices/services will show up from all groups. If, however, I limit the widget to say GroupA-all servers, it will not show the services/servers that are in GroupA-all servers. This holds true for all groups If I go to Devices->Device Groups->GroupA-all servers, the listing will be the correct listing of devices. The issue is similar for alerts in that services that are on hosts that are part of GroupA-all servers will not alert if there is an issue with the service if the alert rule is set to map to GroupA-all servers

Validate info:====================================

Component Version
LibreNMS 1.51-18-geb8600e
DB Schema 2019_02_10_220000_add_dates_to_fdb (132)
PHP 7.2.16
MySQL 5.5.60-MariaDB
RRDTool 1.4.8
SNMP NET-SNMP 5.7.2

====================================

How should I be creating groups or targeting them so that this will work? Thanks.