added support for query in the datasource property of the source field