New one-item-per-source-type mode