Match cmdr fixes for "_find".