#523: change order of os keys
#523: change os match