Allow advanced search of nodes by OS type

Fixes #1790