facility selector fix. bcp yes/no fixes.