added filtering on clicks