more fields added to the inexing and code need to be cleaned