Add some more manual matches.
Combine manual and automatic wheelmap matches.