Remove boundary query for nb layer