Fixed ordering for `cfs_custom_validation`