Improve defaultSetOptions on Collections

Fixes [MLHR-1506](https://malhar.atlassian.net/browse/MLHR-1506)