DRILL-21: demo improvements