GenericResourceApiProvider fixes part 1