Fix github issue #1935 (Query operators should be nested deeper)