Fixed pagination templates
Merge branch 'hotfix/v1.1.1'

* hotfix/v1.1.1:
  Fixed pagination templates