Fix hiera queries

The types now actually reflect what's going on.