Fix entity rule on update. closes #2039