More changes on collection visiblity