MDL-29378 Fix the form display in the Survey/COLLES P+A module