Fixed multiple routing issues