bugfixes: admin.helpers, circular dependencies with with-template
whitespaces