Remove matchtag
Add matchtag with clodfusion support