Well the question really is about breaking things that used to work. The way I see it, if there was something else without the room class that we're overlooking, your code will break it. If you're certain that that isn't the case then I prefer your fix, otherwise it's less risky to filter ourselves.