Done with subject of ticket
also fix-up for all-pages loading