Better more robust visibility setting at batch