Story 41799925: Added client-side filtering to reg and control lists in mapping