GenericResourceApiProvider fixes part 3