Add option to force a room selection