Add admin scope for users and fix query for non-admins