Add more rules, plus fix OR in one rule