Updated queries for non-admin users to filter devices
Updated to fix scrutinizer issues
Merge pull request #261 from laf/issue-libre-260

Updated queries for non-admin users to filter devices