It looks like I'm getting closer to what will work.
Have a look at the reworked DB sent via email.