diff --git a/library/css/main.min.css b/library/css/main.min.css
diff --git a/library/js/dist/main.min.js b/library/js/dist/main.min.js
diff --git a/library/js/scripts.js b/library/js/scripts.js
@@ -62,10 +62,13 @@ var $grid = $('.country-grid').isotope({
 // store filter for each group
 var filters = {};
 
-$('.grid-control').on( 'click', '.checkbox', function() {
+$('.grid-control').on( 'click', '.input', function() {
   var $this = $(this);
   var thisFilter = $this.attr('data-filter');
-  var isAll = thisFilter === 'all';
+  var isAll = thisFilter === 'everything';
+
+  var countryFilter = $this.parents('.grid-control').attr('data-filter-group');
+  var isCountry = countryFilter === 'country';
 
   var group = $this.parents('.grid-control').attr('data-filter-group');
   // create array for filter group, if not there yet
@@ -87,17 +90,23 @@ $('.grid-control').on( 'click', '.checkbox', function() {
     filters[ group ].splice( index, 1 );
   }
 
-
   var comboFilter = getComboFilter( filters );
 
   $grid.isotope({ filter: comboFilter });
   $this.toggleClass('is-checked');
+
   if ( isAll ) {
-    $this.parents('.grid-control').children().addClass('is-checked');
+    $this.parents('.grid-control').children().removeClass('is-checked');
+  }
+  if ( !isAll  &&  !isCountry ) {
+    $('.filter-select-all').removeClass('is-checked');
   }
 });
 
 
+
+
+
 $('.sort-name, .sort-size, .sort-month').click(function(e) {
   var sortValue = $(this).attr('data-sort-value');
   var isReversed = $(this).hasClass('sort-reverse');