Completed migrating most of the resources to external queries.

Added an evidence query to annotation resource.