- Fixed count() behavior after dataSource re-initialization
- Removed duck typing on dataSource for count()