Fixed finding route with null id