Improve hidden field checks for bug 1181