Allow a more dynamic mapping for dynamic templates
Fixing tests
Allow  more matching methods
Set match to '*' by default
Fixing copy&paste error