Bug 1080669 - Clean up resultset boundary and optimize page space