Remove incorrect skip parameter
Fix bugs around category counting