Content cleanup and using parametrizator extension for DS output