Added an option to avoid exposition of empty collections.
Merge branch 'empty_collections'