Fixed bugs in formula entity annotations breaking cycles and cli tools