Kpi fix question upgrades

A few additions to bring this to parity with our internal version.
I would just say `(markdown format)` here. For public consumption, we don't need to communicate which library we are using for the markdown conversion.