Two changes:

Properly checked the default option type for lists
Checked for elements of a new index