Bug fixes for MT 5.2.x

Fixes non functionning fields due to changes on MT core templates.