Add 'Room' to Device data and allow filtering