Change to Filters we use for patch management

We currently have a RAW SQL filter that looks like the following that we use for patch management that gives us machines ending in 1,2,3 and so on:

SELECT
   [vri2_Computer].[Guid],
   [vri2_Computer].[Name]
FROM
   [vRM_Computer_Item] AS [vri2_Computer]
WHERE ([vri2_Computer].[Name] LIKE '%1' OR  [vri2_Computer].[Name] LIKE '%2' OR  [vri2_Computer].[Name] LIKE '%3')

This gives us all machines however we would like to change this to be country based and Windows 7 only so all machines that are W7LONDON that end in 1,2,3 and W7FRANCE 1,2,3 and so on in seperate filters.  Does that make sense?

What is the best way to do this please?

Thanks.