Adding change to use Lastindex of and addingfile type to description and removing invalid query field