fixed bug with data filtering, updated numbers