Improve count for list and add filter event