I'm creating Dynamic Queries to populate groups with our server and network nodes based on location, using the Manage Groups GUI and its built in dynamic queries. I want to query by IP address as it's our most reliable identifier of location at the moment. However, most of our subnets are larger than /24's, which leads me to the problem: the group dynamic query builder seems to only use "AND" logic for its conditions, and I don't see a way to change that. So, for example, if I have a network, 172.1.0.0/23, which might contain server or network nodes anywhere in its range, I'd have to build two dynamic queries in the group, one with the logic "IP Address begins with '172.1.0.'", and one with "IP Address begins with '172.1.1.'" Double it to four queries if it's a /22, and so on. Since it only uses AND logic if you have multiple conditions, and an IP can't start with BOTH of two different strings.
Now I know I can get around this by querying other data like location, but we don't have a good primary source or practices keeping track of locations; querying by IP would be the easiest method with the least amount of manual input. My question is twofold:
1) Am I missing something simple in the GUI where I can input a custom SWQL or SQL query, or switch the logic of the different conditions between AND and OR?

2) I can see in my database where the container definitions are stored (DBO.ContainerMemberDefinitions.Expression), and I can see it's using AND and even some OR functions, though those seem to be auto generated for NULL scenarios. For example, I made a test dynamic query for the above scenario, and this is what Solarwinds stores:
((Nodes.IPAddress LIKE '%172.1.0.%') AND (Nodes.IPAddress LIKE '%172.1.1.%')) |
So, can I simply change the 'AND' function to an 'OR', without breaking the internal logic solarwinds uses to process this argument? I don't know if it will function properly, or how it will even interact with the GUI of the query builder after I edit it. I wasn't able to find any examples of people trying this, or find the right phrase to search to find said examples. Has anyone run into this and found a good solution?