Revised keep hierarchy support in date format and UI context