Performance improvement for empty option lists