Additional adjustments to fix minor hidden input problem