Further amends to mapping logic following tests with Umbraco instance