Fix: Feeds #6032

Considering that the toDateYMD function isn't needed (since can pass false as the second parameter for toDateISO) these templates should be merged together into one (since the only differences would be the second parameter passed to toDateISO and the brackets around datestring).