WQL for collection Java Development 17 x64

Question

Hello,

      I was looking for some help. I'd like to use a collection (query based) on Java Development Kit 17. A report will not work as I need a collection for deployments and future versions of JDK. I have a working query for Java SE 8u 321 x86 but I'm having trouble with WQL and JDK x64. I've tried using the following query but both x86 and x64 "Java" or anything with Java in the name comes up. The exact name in ARP is "Java(TM) SE Development Kit (64-bit)

select SMS_R_SYSTEM.ResourceID,SMS_R_SYSTEM.ResourceType,SMS_R_SYSTEM.Name,SMS_R_SYSTEM.SMSUniqueIdentifier,SMS_R_SYSTEM.ResourceDomainORWorkgroup,SMS_R_SYSTEM.Client from SMS_R_System inner join SMS_G_System_ADD_REMOVE_PROGRAMS_64 on SMS_G_System_ADD_REMOVE_PROGRAMS_64.ResourceID = SMS_R_System.ResourceId where SMS_G_System_ADD_REMOVE_PROGRAMS_64.DisplayName like "%Java%"