PERF: speed-up feat-match