Fixed issue with program.type_id field reference crashing the dashboard
Fixed merge issue