GenericResourceApiProvider fixes part 4