SSP-1550 - Coach facing intake forms now use appropriate dynamic labels
SSP-1881 code cleanup, add unique index