Issue #40. Data provider subquery added