Improved `site_close` logic per issue #1070