Added option optimization for entry lists.