Fixed device query when user is defined

Fixed device query when user is defined

* Addressed an issue where device queries failed when a user was defined.