Rest Collection Resource fixes