[#112305] Changes to select the correct edge list