GPII-154: Improved the hide functionality based on the pull request review.