Some bugfixes related to copy-paste in resource delivery filter.