Make tree check recursive
Fix validation for dataset expressions