Ensure a page number is always passed and fix bug in domain class prohibiting GS from being created.  This concludes the changes for GS needed for this release.