Yes, you are correct and sorry, I just updated the first post to reflect the changes that I made overnight.
Thanks, Robb