Pagination in module Viewer - update
delegated templates in plugins - fix