notification and rules issue fixed as per tickets