Cross format annotations

Here are the changes to get cross-format-annotations work from annotator and annotator-store working in h.