fix fallout: allowing selectable choice for arbitrary things broke classic selectable choice for domains, RT#25623