Revised Namequerys' scoping