Fix for when publish form has multiple grid fields