fix(avoidance): update filtering logic for non-vehicle

fix(avoidance): update filtering logic for non-vehicle #24945