Closes #2636: Page Type model was not always loaded when needed