Fix for issue #6193 - loop through data- attributes for form submission data instead of hard coded