Improved page field support - now work with single page deference.