Add deleting rules and fix order by execute notifies