Fix routing selection bugs