Prepping to move annotations to DB storage, tweak in the REST API