added full Device Query to proper location