hotfix
refactor of value normalization with invalid scope matching detection