Updated queries for non-admin users to filter devices