WP-2606 Adjustment to how year and document_name is saved