improved find usages accuracy