Bug fix: SurfaceOre flag does not work with black/whitelists