Fixed room grouping issues