Fix proxy behavior

Proxy is not actually honored in the current template