Category Page Item Count fix - REVERT BEFORE MERGE