Also add link for rooms
This refs affinitic #5660