Fix bulk validation, additional routing/parent validation