reinstate composite resource type check since GenericResource type still exists
reinstate composite resource type check since GenericResource type still exists

hydroshare/hydroshare,hydroshare/hydroshare,hydroshare/hydroshare,hydroshare/hydroshare,hydroshare/hydroshare