Fixed some issues in ValueVisibility