Refactored sector selection to use ROI directly and fixed SCI-1632