Fix bugs in fromBorD MC checking categories

Peilian Lirequested to merge
peilian_fixbug into master

Fixing bugs in fromBorD MC checking categories, needs ref updates.

Reference Update: !624 (merged)

Edited by Andre Gunther

Merge request reports