Adding better route tab handling

Change-Id: I1e034012c4603a9b3669f808a5295329273071a4