CID toggle button support

Added support for cid filtering toggle button