Add cyclic match detection to linter

  -  Fix cyclic matches