Adjustments to fix hidden input issue