@geemus Okay options = {} implemented.  This was a much more complicated job than the original PR so please review carefully. :-)