Fix client room list and language selection
Revert "Remove redundant data structure"

This reverts commit 698928485e09d767266d2acfded05a2cb15c9003.
Merge branch 'clientroom-fix'