Making changes to ensure the Add/Edit Collection forms work after the
change in schema of some of the tables