Minor changes to topological selection.