Thanks Carsten for the feedback! The following patch remembers the un-expanded file names by re-reading the agenda-files definition file before saving. It matches the expanded file names with the un-expanded and keeps the un-expanded version when saving. If you like it please apply it.