Further work on resolution of target entities. Resolution configuration seems to be setup not fully resolved yet. Further investigation needed.