Fixed sorting by room
Added support for windows shades and door locks