BI-2102: refactor white-box markup