Update to add filters in build_root_map()