Fix product queries ordering + product collection count