Kpi fix question upgrades

A few additions to bring this to parity with our internal version.