Office 2019 collection

[Filip00011]

I am trying to make a collection that gives me the computers with an office 2019 pro plus , but without the computers that already have an upgrade to office 365.

This query doesn't give the correct result:

 

select distinct 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 on SMS_G_System_ADD_REMOVE_PROGRAMS.ResourceID = SMS_R_System.ResourceId 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.DisplayName like "%Office Professional Plus 2019%" or SMS_G_System_ADD_REMOVE_PROGRAMS_64.DisplayName like "%Office Professional Plus 2019%" and (SMS_G_System_ADD_REMOVE_PROGRAMS.DisplayName not like "Microsoft Office 365 ProPlus - en-us" or SMS_G_System_ADD_REMOVE_PROGRAMS_64.DisplayName = "Microsoft 365 Apps for enterprise - en-us")

 

Any ideas?