[SP-29] Added distance selection