Fix up selection API