H-Annotator integration cleanups

- Avoid double scan at boot by passing the intended option
- Don't call domMatcher.scan directly; call the appropriate wrapper on Annotator