Fix the original code query for all devices.
Homogeneize the code to list devices using the incorrect one from users (will be fixed later).