Fix contentCollection to handle removed elements and cleanup autoRender