BACKLOG-5262: use name class pair callback handler instead of cotnextmapper, avoid multiple uncessary queries