Improve the management of the visibility options