Take advantage of the eror management in datasources
Fixes the output of CSS classes
Removes technical output to activity template