NOJIRA make annotations bundle work + transaction safe