Issue #21455 - Changed picker sort to work for static picker collections