added filtering control