Refine room-queries