Improved serchIndexInArgs and makeTensorFactorList
Bug fix
Started rebildFactor, but not done