@rough-minister-58256 - for the mapping if you could point the places to change, I will be happy to make the change and send a PR request