wcd mapping: Add more places to extract record label + catno from, bump number