Fix yaml data grabber