Issues #716,#717,#718 Proxy dialog improvements