Merge datastore opts before listing
Add spec for case-insensitive options

See #2027