Metadata retrieval correction and correct(?) traversal for insertion