Fix filtering; Fix-attempty auto-trigger