Updated query to use new non-null collections query in WSAPI