JC-1627 Refactored list processing