Fix arguments passing
Compute data count excluding non-displayed items
Bump