Fix meta_value handling to be further up for traversal