bugfix for missing facts in BM import and refactoring in BM facts import