Reenable advanced rules

addressed as discussed offline