Added support for independent data and annotation query.