Rather unluckily that seems to have coincided with Tom's changes, so I've only added the bits that have nothing to do with Tom's changes - all of which stand.
Glad that things are in order now. I have nothing else left to complain about with this feature. Thanks.