Fix for the cargo routing. Minor fixes for the search views.