Add additional rewrites
Tag support