Device name and label both in device list please :)

I'd love more ways to sort. I could use the name for something long that includes main function, while using label for something easily remembered that fits on dashboard tiles easily