TEMPORARY bug fix to FindIndex (TBI) and improving some cut