Fix blank page on refresh, enable close WO