Add features of "easier router identification of Switch Between rep...