add additional condition for when the user clicks 'All'