Added an option to avoid exposition of empty collections.