DB: improve find usages grouping