Redo to use both tag and name of rules