added filtering for data