Hi,
We are almost done. I have submitted my fix for you to an expert for his approval and will post it here afterwards. Thank you for your patience.