cleanup queries using predefined prefixes
Add initial concept for adding annotation counts to targets in addition
to the "Annotate Me!" button
Add oas.defaultAddAnnotationCount
Fix regression