Hello again. This problem persists in Moodle 3.0.
We have developed a patch for the issue that is available on the tracker site. https://tracker.moodle.org/browse/MDL-52078#
We aren't sure how to get this code submitted to be added to the next Moodle release... if someone could advise, that'd be great.