Change DataQuery obj implementation to make sense