ADRs map fixes
Merge pull request #214 from alex-gh/adrs_mapfixes2

ADRs map fixes