I have not seen any reports of Alexa being able to do room awareness other than if you group your lights in a particular room as you are already doing. To get true room awareness today with anything other than lights, it's probably going to require the added complication of running Node Red.
I currently have it running to control lights, ceiling fans, & Rokus of the room I am in. @Royski did similar and controls his curtains also.
