diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 6a47f316f..fee6cfad1 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -4,6 +4,9 @@
  - Bugfix [ 884375 ] Fix for multiple forum posts applied also to
    www_viewForum to handle postings that start a new thread.
  - Added German toolbar icons.
+ - Added missing SQL Report help.
+ - Changed the pagination template variables on SQL Report, Article, File
+   Manager and USS to the standard pagination variables.
 
 
 6.0.1
diff --git a/docs/upgrades/upgrade_6.0.1-6.0.2.pl b/docs/upgrades/upgrade_6.0.1-6.0.2.pl
new file mode 100644
index 000000000..7d5353141
--- /dev/null
+++ b/docs/upgrades/upgrade_6.0.1-6.0.2.pl
@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+
+use lib "../../lib";
+use Getopt::Long;
+use Parse::PlainConfig;
+use strict;
+use WebGUI::Session;
+use WebGUI::International;
+use WebGUI::SQL;
+
+
+my $configFile;
+my $quiet;
+
+GetOptions(
+        'configFile=s'=>\$configFile,
+	'quiet'=>\$quiet
+);
+
+WebGUI::Session::open("../..",$configFile);
+
+print "\tFixing pagination template variables.\n" unless ($quiet);
+my $sth = WebGUI::SQL->read("select * from template where namespace in ('SQLReport','USS','Article','FileManager')");
+while (my $data = $sth->hashRef) {
+	$data->{template} =~ s/isFirstPage/pagination.isFirstPage/ig;
+	$data->{template} =~ s/isLastPage/pagination.isLastPage/ig;
+	$data->{template} =~ s/firstPage/pagination.firstPage/ig;
+	$data->{template} =~ s/lastPage/pagination.lastPage/ig;
+	$data->{template} =~ s/nextPage/pagination.nextPage/ig;
+	$data->{template} =~ s/pageList/pagination.pageList.upTo20/ig;
+	$data->{template} =~ s/previousPage/pagination.previousPage/ig;
+	$data->{template} =~ s/multiplePages/pagination.pageCount.isMultiple/ig;
+	$data->{template} =~ s/numberOfPages/pagination.pageCount/ig;
+	$data->{template} =~ s/pageNumber/pagination.pageNumber/ig;
+	WebGUI::SQL->write("update template set template=".quote($data->{template})." where namespace=".quote($data->{namespace})." and templateId=".quote($data->{templateId}));
+}
+$sth->close;
+
+WebGUI::Session::close();
+
+
diff --git a/docs/upgrades/upgrade_6.0.1-6.0.2.sql b/docs/upgrades/upgrade_6.0.1-6.0.2.sql
index 10ab853eb..875604274 100644
--- a/docs/upgrades/upgrade_6.0.1-6.0.2.sql
+++ b/docs/upgrades/upgrade_6.0.1-6.0.2.sql
@@ -1,4 +1,31 @@
 insert into webguiVersion values ('6.0.2','upgrade',unix_timestamp());
 update language set toolbar='german' where languageId=2;
 alter table language change toolbar toolbar varchar(35) not null default 'metal';
+delete from help where helpId=1 and namespace='SQLReport';
+insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (1, 'SQLReport', 61, 71, '2,SQLReport;21,WebGUI;');
+delete from help where helpId=2 and namespace='SQLReport';
+insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'SQLReport', 72, 73, '79,WebGUI;1,SQLReport;51,WebGUI;');
+delete from international where languageId=1 and namespace='SQLReport' and internationalId=61;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (61,1,'SQLReport','SQL Report, Add/Edit', 1082365503,NULL);
+delete from international where languageId=1 and namespace='SQLReport' and internationalId=71;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (71,1,'SQLReport','SQL Reports are perhaps the most powerful wobject in the WebGUI arsenal. They allow a user to query data from any database that they have access to. This is great for getting sales figures from your Accounting database or even summarizing all the message boards on your web site.\r\n<p>\r\n\r\n\r\n<b>Preprocess macros on query?</b><br>\r\nIf you\'re using WebGUI macros in your query you\'ll want to check this box.\r\n<p>\r\n\r\n\r\n<b>Debug?</b><br>\r\nIf you want to display debugging and error messages on the page, check this box.\r\n<p>\r\n\r\n\r\n<b>Query</b><br>\r\nThis is a standard SQL query. If you are unfamiliar with SQL then you\'ll likely not want to use this wobject. You can make your queries more dynamic by using the ^FormParam(); macro.\r\n<p>\r\n\r\n<b>Database Link</b><br>\r\nThe administrator can configure common databases on which you can run SQL Reports, freeing you from having to know or enter the connectivity information.\r\n<p>\r\n\r\n<b>Paginate After</b>\r\nHow many rows should be displayed before splitting the results into separate pages? In other words, how many rows should be displayed per page?\r\n<p>\r\n\r\n\r\n', 1082365503,NULL);
+delete from international where languageId=1 and namespace='SQLReport' and internationalId=73;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (73,1,'SQLReport','The following variables are made available from SQL Reports:\r\n<p>\r\n\r\n<b>columns_loop</b><br />\r\nA loop containing information about each column.\r\n<br /><br />\r\n<blockquote>\r\n\r\n<b>column.number</b><br />\r\nAn integer starting with 1 and counting through the number of columns.\r\n<br /><br />\r\n\r\n<b>column.name</b><br />\r\nThe name of this column as returned by the query.\r\n<br /><br />\r\n\r\n</blockquote>\r\n\r\n<b>rows_loop</b><br />\r\nA loop containing the data returned from the query.\r\n<br /><br />\r\n<blockquote>\r\n\r\n<b>row.number</b><br />\r\nAn integer starting with 1 and counting through the total list of rows.\r\n<br /><br />\r\n\r\n<b>row.field.<b><i>NAME</i></b>.value</b><br />\r\nThe data for a given field in this row where NAME is the name of the field as it is returned by the query.\r\n<br /><br />\r\n\r\n<b>row.field_loop</b><br />\r\nA loop containing all of the fields for this row.\r\n<br /><br />\r\n<blockquote>\r\n\r\n<b>field.number</b><br />\r\nAn integer starting with 1 and counting through the number of fields in this row. This is the same as column.number in the column_loop.\r\n<br /><br />\r\n\r\n<b>field.name</b><br />\r\nThe name of the field as it is returned by the query.\r\n<br /><br />\r\n\r\n<b>field.value</b><br />\r\nThe data in this field.\r\n<br /><br />\r\n\r\n</blockquote>\r\n\r\n</blockquote>\r\n\r\n<b>rows.count</b><br />\r\nThe total number of rows returned by the query.\r\n<br /><br />\r\n\r\n<b>rows.count.isZero</b><br />\r\nA boolean indicating that the query returned zero rows.\r\n<br /><br />\r\n\r\n<b>rows.count.isZero.label</b><br />\r\nThe default label for rows.count.isZero.\r\n<br /><br />\r\n\r\n', 1082365471,NULL);
+delete from help where helpId=2 and namespace='USS';
+insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'USS', 74, 75, '79,WebGUI;1,USS;51,WebGUI;');
+delete from international where languageId=1 and namespace='USS' and internationalId=75;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (75,1,'USS','This is the listing of template variables available in user submission system templates.\r\n<p/>\r\n\r\n<b>readmore.label</b><br/>\r\nA translated label that indicates that the user should click to read more.\r\n<p/>\r\n\r\n<b>responses.label</b><br/>\r\nA translated label that indicates that the user should click to view the responses to this submission.\r\n<p/>\r\n\r\n<b>canPost</b><br/>\r\nA condition that indicates whether a user can add a new submission.\r\n<p/>\r\n\r\n<b>post.url</b><br/>\r\nThe URL to add a new submission.\r\n<p/>\r\n\r\n<b>post.label</b><br/>\r\nA translated label for the post link.\r\n<p/>\r\n\r\n<b>addquestion.label</b><br>\r\nA translated label that prompts the user to add a question to the USS.\r\n<p>\r\n\r\n<b>addlink.label</b><br>\r\nA translated label that prompts the user to add a link to the USS.\r\n<p>\r\n\r\n<b>search.label</b><br/>\r\nA translated label for the search link.\r\n<p/>\r\n\r\n<b>search.url</b><br/>\r\nThe URL to toggle on/off WebGUI\'s power search form.\r\n<p/>\r\n\r\n<b>search.form</b><br/>\r\nWebGUI\'s power search form.\r\n<p/>\r\n\r\n<b>rss.url</b><br>\r\nThe URL to generate an RSS feed from the content in the USS.\r\n<p>\r\n\r\n<b>canModerate</b><br>\r\nA condition indicating whether the current user has the rights to moderate posts in this USS.\r\n<p>\r\n\r\n<b>title.label</b><br/>\r\nA translated label for the title column.\r\n<p/>\r\n\r\n<b>thumbnail.label</b><br/>\r\nA translated label for the thumbnail column.\r\n<p/>\r\n\r\n<b>date.label</b><br/>\r\nA translated label for the date column.\r\n<p/>\r\n\r\n<b>date.updated.label</b><br/>\r\nThe translated label indicating what date this submission was last edited.\r\n<p/>\r\n\r\n<b>by.label</b><br/>\r\nA translated label stating who the submission was submitted by.\r\n<p/>\r\n\r\n<b>submission.edit.label</b><br>\r\nA translated text label that prompts the user to edit a particular submission.\r\n<p>\r\n\r\n<b>submissions_loop</b><br/>\r\nA loop containing each submission.\r\n<blockquote>\r\n\r\n<b>submission.id</b><br/>\r\nA unique identifier for this submission.\r\n<p/>\r\n\r\n<b>submission.url</b><br/>\r\nThe URL to view this submission.\r\n<p/>\r\n\r\n<b>submission.content</b><br/>\r\nThe abbreviated text content of this submission.\r\n<p/>\r\n\r\n<b>submission.content.full</b><br/>\r\nThe full text content of this submission.\r\n<p/>\r\n\r\n\r\n<b>submission.responses</b><br/>\r\nThe number of responses to this submission.\r\n<p/>\r\n\r\n<b>submission.title</b><br/>\r\nThe title for this submission.\r\n<p/>\r\n\r\n<b>submission.userDefined1 - submission.userDefined5</b><br>\r\nA series of user defined fields to add custom functionality to the USS.\r\n<p>\r\n\r\n<b>submission.userId</b><br/>\r\nThe user id of the user that posted this submission.\r\n<p/>\r\n\r\n<b>submission.username</b><br/>\r\nThe username of the person that posted this submission.\r\n<p/>\r\n\r\n<b>submission.status</b><br/>\r\nThe status of this submission (approved, pending, denied).\r\n<p/>\r\n\r\n<b>submission.thumbnail</b><br/>\r\nThe thumbnail of the image uploaded with this submission (if any).\r\n<p/>\r\n\r\n<b>submission.image</b><br>\r\nThe URL of the image attached to this submission.\r\n<p>\r\n\r\n\r\n<b>submission.date</b><br/>\r\nThe that this submission was posted.\r\n<p/>\r\n\r\n<b>submission.date.updated</b><br/>\r\nA human readable date that displays the date and time this submission was last edited.\r\n<p/>\r\n\r\n<b>submission.currentUser</b><br/>\r\nA condition indicating whether the current user is the same as the user that posted this submission.\r\n<p/>\r\n\r\n<b>submission.userProfile</b><br/>\r\nThe URL to the profile of the user that posted this submission.\r\n<p/>\r\n\r\n<b>submission.edit.url</b><br>\r\nThe URL to edit this submission.\r\n<p>\r\n\r\n\r\n<b>submission.secondColumn</b><br/>\r\nA condition indicating whether or not this submission would belong in the second column, in a multi-column layout.\r\n<p/>\r\n\r\n<b>submission.thirdColumn</b><br/>\r\nA condition indicating whether or not this submission would belong in the third column, in a multi-column layout.\r\n<p/>\r\n\r\n<b>submission.fourthColumn</b><br/>\r\nA condition indicating whether or not this submission would belong in the fourth column, in a multi-column layout.\r\n<p/>\r\n\r\n<b>submission.fifthColumn</b><br/>\r\nA condition indicating whether or not this submission would belong in the fifth column, in a multi-column layout.\r\n<p/>\r\n\r\n<b>submission.controls</b><br>\r\nThe administrative toolbar for each submission.\r\n<p>\r\n\r\n</blockquote>\r\n<p/>\r\n\r\n', 1082367203,NULL);
+delete from help where helpId=2 and namespace='Article';
+insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (2, 'Article', 72, 73, '1,Article;79,WebGUI;51,WebGUI;');
+delete from help where helpId=3 and namespace='FileManager';
+insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (3, 'FileManager', 75, 76, '1,FileManager;79,WebGUI;51,WebGUI;');
+delete from international where languageId=1 and namespace='FileManager' and internationalId=76;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (76,1,'FileManager','This is the list of template variables available in File Manager templates.\r\n<p/>\r\n\r\n<b>titleColumn.url</b><br/>\r\nThe URL to sort by the title.\r\n<p/>\r\n\r\n<b>titleColumn.label</b><br/>\r\nThe translated label for the title.\r\n<p/>\r\n\r\n<b>descriptionColumn.label</b><br/>\r\nThe translated label for the description.\r\n<p/>\r\n\r\n<b>descriptionColumn.url</b><br/>\r\nThe URL to sort by the description.\r\n<p/>\r\n\r\n<b>dateColumn.label</b><br/>\r\nThe translated label for the upload date.\r\n<p/>\r\n\r\n<b>dateColumn.url</b><br/>\r\nThe URL to sort by the date uploaded.\r\n<p/>\r\n\r\n<b>search.form</b><br/>\r\nWebGUI\'s power search form.\r\n<p/>\r\n\r\n<b>search.url</b><br/>\r\nThe URL to toggle search mode on and off.\r\n<p/>\r\n\r\n<b>search.label</b><br/>\r\nThe translated label for the search link.\r\n<p/>\r\n\r\n<b>addfile.url</b><br/>\r\nThe URL to add a file to the file manager.\r\n<p/>\r\n\r\n<b>addfile.label</b><br/>\r\nThe translated label for the add file link.\r\n<p/>\r\n\r\n<b>file_loop</b><br/>\r\nA loop containing the information about each file uploaded to this file manager.\r\n<blockquote>\r\n<b>file.canView</b><br/>\r\nA condition as to whether the current user has the privileges to view this file.\r\n<p/>\r\n<b>file.controls</b><br/>\r\nThe WebGUI management controls for this file.\r\n<p/>\r\n<b>file.title</b><br/>\r\nThe title for this file.\r\n<p/>\r\n<b>file.version1.name</b><br/>\r\nThe filename for the first version of this file.\r\n<p/>\r\n<b>file.version1.url</b><br/>\r\nThe download URL for the first version of this file.\r\n<p/>\r\n<b>file.version1.icon</b><br/>\r\nThe URL to the icon for the file type of the first version of this file.\r\n<p/>\r\n<b>file.version1.size</b><br/>\r\nThe storage size of the first version of this file.\r\n<p/>\r\n<b>file.version1.type</b><br/>\r\nThe type (or file extension) of the first version of this file.\r\n<p/>\r\n<b>file.version1.thumbnail</b><br/>\r\nThe URL to the thumbnail for the first version of this file.\r\n<p/>\r\n<b>file.version1.isImage</b><br/>\r\nA conditional indicating whether the first version of this file is an image or not.\r\n<p/>\r\n<b>file.version2.name</b><br/>\r\nThe filename for the second version of this file.\r\n<p/>\r\n<b>file.version2.url</b><br/>\r\nThe download URL for the second version of this file.\r\n<p/>\r\n<b>file.version2.icon</b><br/>\r\nThe URL to the icon for the file type of the second version of this file.\r\n<p/>\r\n<b>file.version2.size</b><br/>\r\nThe storage size of the second version of this file.\r\n<p/>\r\n<b>file.version2.type</b><br/>\r\nThe type (or file extension) of the second version of this file.\r\n<p/>\r\n<b>file.version2.thumbnail</b><br/>\r\nThe URL to the thumbnail for the second version of this file.\r\n<p/>\r\n<b>file.version2.isImage</b><br/>\r\nA conditional indicating whether the second version of this file is an image or not.\r\n<p/>\r\n<b>file.version3.name</b><br/>\r\nThe filename for the third version of this file.\r\n<p/>\r\n<b>file.version3.url</b><br/>\r\nThe download URL for the third version of this file.\r\n<p/>\r\n<b>file.version3.icon</b><br/>\r\nThe URL to the icon for the file type of the third version of this file.\r\n<p/>\r\n<b>file.version3.size</b><br/>\r\nThe storage size of the third version of this file.\r\n<p/>\r\n<b>file.version3.type</b><br/>\r\nThe type (or file extension) of the third version of this file.\r\n<p/>\r\n<b>file.version3.thumbnail</b><br/>\r\nThe URL to the thumbnail for the third version of this file.\r\n<p/>\r\n<b>file.version3.isImage</b><br/>\r\nA conditional indicating whether the third version of this file is an image or not.\r\n<p/>\r\n<b>file.description</b><br/>\r\nThe description of this file.\r\n<p/>\r\n<b>file.date</b><br/>\r\nThe date that this file was uploaded.\r\n<p/>\r\n<b>file.time</b><br/>\r\nThe time that this file was uploaded.\r\n<p/>\r\n</blockquote>\r\n<p/>\r\n<b>noresults.message</b><br/>\r\nA translated message stating that this file manager has no files for this user to view.\r\n<p/>\r\n<b>noresults</b><br/>\r\nA conditional indicating whether there are any files for this user to view.\r\n<p/>\r\n\r\n', 1082371148,NULL);
+delete from international where languageId=1 and namespace='Article' and internationalId=73;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (73,1,'Article','The following template variables are available for article templates.\r\n<p/>\r\n\r\n<b>new.template</b><br>\r\nArticles have the special ability to change their template so that you can allow users to see different views of the article. You do this by creating a link with a URL like this (replace 999 with the template Id you wish to use):<p>\r\n&lt;a href=\"&lt;tmpl_var new.template&gt;999\"&gt;Read more...&lt;/a&gt;\r\n<p>\r\n<b>description.full</b><br>\r\nThe full description without any pagination. (For the paginated description use \"description\" instead.)\r\n<p>\r\n\r\n<b>description.first.100words</b><br>\r\nThe first 100 words in the description. Words are defined as characters separated by whitespace, so HTML entities and tags count as words.\r\n<p>\r\n\r\n<b>description.first.75words</b><br>\r\nThe first 75 words in the description. Words are defined as characters separated by whitespace, so HTML entities and tags count as words.\r\n<p>\r\n\r\n<b>description.first.50words</b><br>\r\nThe first 50 words in the description. Words are defined as characters separated by whitespace, so HTML entities and tags count as words.\r\n<p>\r\n\r\n<b>description.first.25words</b><br>\r\nThe first 25 words in the description. Words are defined as characters separated by whitespace, so HTML entities and tags count as words.\r\n<p>\r\n\r\n<b>description.first.10words</b><br>\r\nThe first 10 words in the description. Words are defined as characters separated by whitespace, so HTML entities and tags count as words.\r\n<p>\r\n\r\n<b>description.first.paragraph</b><br>\r\nThe first paragraph of the description. The first paragraph is determined by the first carriage return found in the text.\r\n<p>\r\n\r\n<b>description.first.2paragraphs</b><br>\r\nThe first two paragraphs of the description. A paragraph is determined by counting the carriage returns found in the text.\r\n<p>\r\n\r\n<b>description.first.sentence</b><br>\r\nThe first sentence in the description. A sentence is determined by counting the periods found in the text.\r\n<p>\r\n\r\n<b>description.first.2sentences</b><br>\r\nThe first two sentences in the description. A sentence is determined by counting the periods found in the text.\r\n<p>\r\n\r\n<b>description.first.3sentences</b><br>\r\nThe first three sentences in the description. A sentence is determined by counting the periods found in the text.\r\n<p>\r\n\r\n<b>description.first.4sentences</b><br>\r\nThe first four sentences in the description. A sentence is determined by counting the periods found in the text.\r\n<p>\r\n\r\n\r\n\r\n<b>attachment.box</b><br/>\r\nOutputs a standard WebGUI attachment box including icon, filename, and attachment indicator.\r\n<p/>\r\n\r\n<b>attachment.icon</b><br/>\r\nThe URL to the icon image for this attachment type.\r\n<p/>\r\n\r\n<b>attachment.name</b><br/>\r\nThe filename for this attachment.\r\n<p/>\r\n\r\n<b>attachment.url</b><br/>\r\nThe URL to download this attachment.\r\n<p/>\r\n\r\n<b>image.thumbnail</b><br/>\r\nThe URL to the thumbnail for the attached image.\r\n<p/>\r\n\r\n<b>image.url</b><br/>\r\nThe URL to the attached image.\r\n<p/>\r\n\r\n<b>post.label</b><br/>\r\nThe translated label to add a comment to this article.\r\n<p/>\r\n\r\n\r\n<b>post.URL</b><br/>\r\nThe URL to add a comment to this article.\r\n<p/>\r\n\r\n<b>replies.count</b><br/>\r\nThe number of comments attached to this article.\r\n<p/>\r\n\r\n<b>replies.label</b><br/>\r\nThe translated text indicating that you can view the replies.\r\n<p/>\r\n\r\n<b>replies.url</b><br/>\r\nThe URL to view the replies to this article.\r\n<p/>\r\n\r\n', 1082370724,NULL);
+delete from international where languageId=1 and namespace='WebGUI' and internationalId=1086;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (1086,1,'WebGUI','Many wobjects have pagination features. Though some wobjects define their own pagination variables, most use a common set of pagination variables. These are those:\r\n\r\n<br /><br />\r\n\r\n<b>pagination.firstPage</b><br>\r\nA link to the first page in the paginator.\r\n<p> \r\n\r\n<b>pagination.isFirstPage</b><br>\r\nA boolean indicating whether the current page is the first page.\r\n<p> \r\n\r\n\r\n<b>pagination.lastPage</b><br>\r\nA link to the last page in the paginator.\r\n<p> \r\n\r\n<b>pagination.isLastPage</b><br>\r\nA boolean indicating whether the current page is the last page.\r\n<p> \r\n\r\n<b>pagination.nextPage</b><br>\r\nA link to the next page in the paginator relative to the current page.\r\n<p> \r\n\r\n<b>pagination.previousPage</b><br>\r\nA link to the previous page in the paginator relative to the current page.\r\n<p> \r\n\r\n<b>pagination.pageNumber</b><br>\r\nThe current page number.\r\n<p> \r\n\r\n<b>pagination.pageCount</b><br>\r\nThe total number of pages.\r\n<p> \r\n\r\n<b>pagination.pageCount.isMultiple</b><br>\r\nA boolean indicating whether there is more than one page.\r\n<p> \r\n\r\n<b>pagination.pageList</b><br>\r\nA list of links to every page in the paginator.\r\n<p> \r\n\r\n\r\n<b>pagination.pageList.upTo20</b><br>\r\nA list of links to the 20 nearest in the paginator relative to the current page. So if you\'re on page 60, you\'ll see links for 50-70.\r\n<p> \r\n\r\n<b>pagination.pageList.upTo10</b><br>\r\nA list of links to the 10 nearest in the paginator relative to the current page. So if you\'re on page 20, you\'ll see links for 15-25.\r\n<p> \r\n\r\n', 1082370668,NULL);
+
+
+
 
diff --git a/lib/WebGUI/Paginator.pm b/lib/WebGUI/Paginator.pm
index 7de491cca..b8885c617 100644
--- a/lib/WebGUI/Paginator.pm
+++ b/lib/WebGUI/Paginator.pm
@@ -77,6 +77,9 @@ The hash reference to append the variables to.
 sub appendTemplateVars {
 	my $self = shift;
 	my $var = shift;
+	$var->{'pagination.isFirstPage'} = ($self->getPageNumber == 1);
+	$var->{'pagination.isLastPage'} = ($self->getPageNumber == $self->getNumberOfPages);
+	$var->{'pagination.firstPage'} = $self->getFirstPageLink;
 	$var->{'pagination.firstPage'} = $self->getFirstPageLink;
 	$var->{'pagination.lastPage'} = $self->getLastPageLink;
 	$var->{'pagination.nextPage'} = $self->getNextPageLink;
diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm
index 837d6d596..2e62f04ea 100644
--- a/lib/WebGUI/Wobject/Article.pm
+++ b/lib/WebGUI/Wobject/Article.pm
@@ -164,14 +164,7 @@ sub www_view {
 		my $p = WebGUI::Paginator->new(WebGUI::URL::page("wid=".$_[0]->get("wobjectId")."&func=view"),1);
 		$p->setDataByArrayRef(\@pages);
 		$var{description} = $p->getPage;
-		$var{firstPage} = $p->getFirstPageLink;
-        	$var{lastPage} = $p->getLastPageLink;
-        	$var{nextPage} = $p->getNextPageLink;
-        	$var{pageList} = $p->getPageLinks;
-        	$var{previousPage} = $p->getPreviousPageLink;
-        	$var{multiplePages} = ($p->getNumberOfPages > 1);
-		$var{isLastPage} = ($p->getNumberOfPages == $p->getPageNumber);
-		$var{isFirstPage} = (1 == $p->getPageNumber);
+		$p->appendTemplateVars(\%var);
 	}
 	if ($_[0]->get("attachment") ne "") {
 		$file = WebGUI::Attachment->new($_[0]->get("attachment"),$_[0]->get("wobjectId"));
diff --git a/lib/WebGUI/Wobject/FileManager.pm b/lib/WebGUI/Wobject/FileManager.pm
index 139349b20..93c74786b 100644
--- a/lib/WebGUI/Wobject/FileManager.pm
+++ b/lib/WebGUI/Wobject/FileManager.pm
@@ -401,12 +401,7 @@ sub www_view {
 	$var{"noresults.message"} = WebGUI::International::get(19,$_[0]->get("namespace"));
 	$var{noresults} = !$flag;
         $var{file_loop} = \@fileloop;
-        $var{firstPage} = $p->getFirstPageLink;
-        $var{lastPage} = $p->getLastPageLink;
-        $var{nextPage} = $p->getNextPageLink;
-        $var{pageList} = $p->getPageLinks;
-        $var{previousPage} = $p->getPreviousPageLink;
-        $var{multiplePages} = ($p->getNumberOfPages > 1);
+	$p->appendTemplateVars(\%var);
         return $_[0]->processTemplate($_[0]->get("templateId"),\%var);
 }
 
diff --git a/lib/WebGUI/Wobject/SQLReport.pm b/lib/WebGUI/Wobject/SQLReport.pm
index fe2806a12..47a174f71 100644
--- a/lib/WebGUI/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Wobject/SQLReport.pm
@@ -164,14 +164,7 @@ sub www_view {
 				$var{'rows.count'} = $p->getRowCount;
 				$var{'rows.count.isZero'} = ($p->getRowCount < 1);
 				$var{'rows.count.isZero.label'} = WebGUI::International::get(18,$_[0]->get("namespace"));
-				$var{firstPage} = $p->getFirstPageLink;
-        			$var{lastPage} = $p->getLastPageLink;
-        			$var{nextPage} = $p->getNextPageLink;
-        			$var{pageList} = $p->getPageLinks;
-        			$var{previousPage} = $p->getPreviousPageLink;
-        			$var{multiplePages} = ($p->getNumberOfPages > 1);
-        			$var{numberOfPages} = $p->getNumberOfPages;
-        			$var{pageNumber} = $p->getPageNumber;
+				$p->appendTemplateVars(\%var);
 			}
                	} else {
 			push(@debug,{'debug.output'=>WebGUI::International::get(10,$_[0]->get("namespace"))});
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index cb11ed5e2..374853be7 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -736,12 +736,7 @@ sub www_view {
 		$i++;
 	}
 	$var{submissions_loop} = \@submission;
-	$var{firstPage} = $p->getFirstPageLink;
-	$var{lastPage} = $p->getLastPageLink;
-	$var{nextPage} = $p->getNextPageLink;
-	$var{pageList} = $p->getPageLinks;
-	$var{previousPage} = $p->getPreviousPageLink;
-	$var{multiplePages} = ($p->getNumberOfPages > 1);
+	$p->appendTemplateVars(\%var);
 	return $_[0]->processTemplate($_[0]->get("templateId"),\%var);
 }