Add fields needed for kayak extra choices selection.
Only expose extra choices if relevant.

Clean up debugging code.