last commit fix(plugins and page plugins)