reduced number of queries - standardize template wording
Initial annotation detail
annotation detail template complete
Tests pass