updated to filter data during query;