Add and Edit Rule support fixes