Network selection rework