Fixes for webform submissions
Merge catalogs page changes