Fix issues with build element for hidden values