adding index to remoteID and source