Sort:  

Done. That change on the Aid+Gateway client might help. Will let you know more feedback later today.

I will check it again later at lunch time.