#1158 Fixed loading of page data