How to create a Windows 7 x86 or x64 WMI Filter

I want to deploy some applications to different OS versions. I created some WMI filters. I added the right Group Policy to the right WMI filter.

Target Win 7 32 bit machines:

select * from Win32_OperatingSystem WHERE Version like "6.1%" AND ProductType="1" AND NOT OSArchitecture = "64-bit"

Target Win 7 64Bit machines:

select * from Win32_OperatingSystem WHERE Version like "6.1%" AND ProductType="1" AND OSArchitecture = "64-bit"

Target any 32 bit OS;

SELECT AddressWidth FROM Win32_Processor WHERE AddressWidth =’32’

Target any 64Bit OS:

SELECT AddressWidth FROM Win32_Processor WHERE AddressWidth =’64