Modified list to submit all options instead of just keys.

The decision where to put options is a bit sloppy and needs review.