Fix sorting on newly created forms