Fix OML measurements and BPQuerier annotation