#561 Fix usage terms counts