GenericResourceApiProvider fixes part 2