Improvements for getting page by page type