Fix current state attributes update

[darkodraskovic]

Current state can have attributes that correspond to channels with and without subtopics. When an attribute is built with channel + subtopic, it gets updated as expected in the current state card on twin info page. However, an attribute built without subtopic picks up subtopic messages also.