Changes to fix fill down in generic scan