Better handle of conversion on component-state-list in to media-query