Made advertisement creation more restrictive to ensure inclusion of local endpoints and cleanups for proxy failure cases #448