Updates for short page content load bug