Optimize Adding Entries in List Builder.

No Ticket.

Reviewer: Aldrin