Correct metadata and cleaned list view