Fixed the form shortcode to work with structuring of the results.