Add support for non :node searches