Added a composite query to hold other queries...