Fix/better handling of no-stats-tracking rules