added back some proxy code, fixing server load, fix #1447