Fixing Route problems bugs