Minor changes to avoid page cache which is not loading the page