Fixed issues with resolution scope mapping.