Separate rules distinctively, if/else clause doesn’t act as expected