bug fix for pages, restapis