SD-1685 first part - Single selection