Merging hidden field and scoping fix