Update for 2.2, fix hidden input issue