switch to fluent validation
update commands using the hierarchy picker to use a consistent order for master and children