Implementation for add/remove filter rules via cli

Also issues from PR 1974
fixing missed conflict