Catalog Controller field save fix 2