Add switch to track matching as requested by Alexei, matching done by default