Fixed some routing and highlight of current selection