Fix issue with field visibility control