fixing some routing issues