PROM-708: Set key correctly for option values.