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