Address TODOs left while adding _renderedCollection