Filter by info instead of dim
Revert "Filter by info instead of dim"

This reverts commit 28c58175d540189304b6ad71694d3940af7ed1ba.
Fix wrong count comparison