DRY on filter function, apply filter to newly added rooms