Hi,
I have submitted my fix to an Expert here and will post here after his approval. Thank you for your patience.