fix page cache issues
page-aftersave save timing
and fix return before hook