Fixed navset2 mapping on value and label field