better support for multi rooms using the id - still a nasty hack tho