minor changes in subquery API