Rework of property flag + notification rules part 2