More data selection validation mods [1470]