GPO WMI Filters for Windows 8 and Windows 8.1

I'm looking to create some new GPO WMI filters to manage windows 8 computers in our domain. I see that 8.1 uses is v6.3 as opposed to v6.2 that 8.0 was. I am planning to create these filters for these types of workstations, please let me know if these seem correct:

WMI Filter to target: Windows 8.0 and Windows 8.1 Workstations

QueryNamespace: root\CIMv2

Query: select * from Win32_OperatingSystem where (Version like "6.2%" or Version like "6.3%") and ProductType = "1"

WMI Filter to target: Windows 7, Windows 8.0 and Windows 8.1 Workstations

QueryNamespace: root\CIMv2

Query: select * from Win32_OperatingSystem where (Version like "6.1%" or Version like "6.2%" or Version like "6.3%") and ProductType = "1"

ss