Make sure selection fields are storing lists (or maybe tuples)

See #385