Inital modifications to support per location dn and filter