Created option to include 'All' or 'None'