If there were multiple rest data sources, the index needed to be incremented by type instead of by data source/type